joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-02 16:06:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

gpu/backend: remove clear color and depth state

Browse Source 
Specifying the clear color and depth at the time of clearing is
less error prone and a better for modern GPU APIs. As a bonus, we
can get rid of the BufferAttachment type.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-03-15 12:20:19 +01:00
parent daecdcaabf
commit 7fba3bb8fe
7 changed files with 24 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/d3d11/backend_windows.go
+8 -15
View File
@@ -10,7 +10,6 @@ import (
"unsafe"
"gioui.org/gpu/backend"
"gioui.org/internal/f32color"
gunsafe "gioui.org/internal/unsafe"
"golang.org/x/sys/windows"
)
@@ -27,8 +26,8 @@ type Device struct {
}
type Backend struct {
clearColor f32color.RGBA
clearDepth float32
// Temporary storage to avoid garbage.
clearColor [4]float32
viewport _D3D11_VIEWPORT
depthState depthState
blendState blendState
@@ -539,16 +538,14 @@ func (b *Backend) NewProgram(vertexShader, fragmentShader backend.ShaderSources)
return p, nil
}
func (b *Backend) ClearColor(colr, colg, colb, cola float32) {
b.clearColor = f32color.RGBA{R: colr, G: colg, B: colb, A: cola}
func (b *Backend) Clear(colr, colg, colb, cola float32) {
b.clearColor = [4]float32{colr, colg, colb, cola}
b.dev.ctx.ClearRenderTargetView(b.fbo.renderTarget, &b.clearColor)
}
func (b *Backend) Clear(buffers backend.BufferAttachments) {
if buffers&backend.BufferAttachmentColor != 0 {
b.dev.ctx.ClearRenderTargetView(b.fbo.renderTarget, &b.clearColor)
}
if buffers&backend.BufferAttachmentDepth != 0 && b.fbo.depthView != nil {
b.dev.ctx.ClearDepthStencilView(b.fbo.depthView, _D3D11_CLEAR_DEPTH|_D3D11_CLEAR_STENCIL, b.clearDepth, 0)
func (b *Backend) ClearDepth(depth float32) {
if b.fbo.depthView != nil {
b.dev.ctx.ClearDepthStencilView(b.fbo.depthView, _D3D11_CLEAR_DEPTH|_D3D11_CLEAR_STENCIL, depth, 0)
}
}
@@ -650,10 +647,6 @@ func (b *Backend) DepthFunc(f backend.DepthFunc) {
b.depthState.fn = f
}
func (b *Backend) ClearDepth(d float32) {
b.clearDepth = d
}
func (b *Backend) SetBlend(enable bool) {
b.blendState.enable = enable
}
app/internal/d3d11/d3d11_windows.go
+1 -1
View File
@@ -1034,7 +1034,7 @@ func (c *_ID3D11DeviceContext) ClearDepthStencilView(target *_ID3D11DepthStencil
)
}
func (c *_ID3D11DeviceContext) ClearRenderTargetView(target *_ID3D11RenderTargetView, color *f32color.RGBA) {
func (c *_ID3D11DeviceContext) ClearRenderTargetView(target *_ID3D11RenderTargetView, color *[4]float32) {
syscall.Syscall(
c.vtbl.ClearRenderTargetView,
3,