gp/internal/opengl: support sRGB emulation for embedded content

Programs such as gio-example/glfw rely on Gio drawing blending with
the framebuffer background. This change makes it so when sRGB emulation
is active.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-05-16 12:44:37 +02:00
parent 351ede917c
commit 39775f555a
6 changed files with 18 additions and 6 deletions
+1 -1
View File
@@ -280,7 +280,7 @@ func (g *compute) Frame() error {
Y: (viewport.Y + tileHeightPx - 1) / tileHeightPx,
}
defFBO := g.ctx.BeginFrame(viewport)
defFBO := g.ctx.BeginFrame(g.drawOps.clear, viewport)
defer g.ctx.EndFrame()
if g.drawOps.profile && g.timers.t == nil && g.ctx.Caps().Features.Has(driver.FeatureTimers) {
+1 -1
View File
@@ -426,7 +426,7 @@ func (g *gpu) Collect(viewport image.Point, frameOps *op.Ops) {
func (g *gpu) Frame() error {
viewport := g.renderer.blitter.viewport
defFBO := g.ctx.BeginFrame(viewport)
defFBO := g.ctx.BeginFrame(g.drawOps.clear, viewport)
defer g.ctx.EndFrame()
for _, img := range g.drawOps.imageOps {
expandPathOp(img.path, img.clip)
+1 -1
View File
@@ -174,7 +174,7 @@ func newDriver(t *testing.T) driver.Device {
if err != nil {
t.Fatal(err)
}
b.BeginFrame(image.Pt(1, 1))
b.BeginFrame(true, image.Pt(1, 1))
t.Cleanup(func() {
b.EndFrame()
ctx.ReleaseCurrent()
+1 -1
View File
@@ -164,7 +164,7 @@ func newDirect3D11Device(api driver.Direct3D11) (driver.Device, error) {
return b, nil
}
func (b *Backend) BeginFrame(viewport image.Point) driver.Framebuffer {
func (b *Backend) BeginFrame(clear bool, viewport image.Point) driver.Framebuffer {
renderTarget, depthView := b.ctx.OMGetRenderTargets()
// Assume someone else is holding on to the render targets.
if renderTarget != nil {
+1 -1
View File
@@ -12,7 +12,7 @@ import (
// APIs such as OpenGL, Direct3D useful for rendering Gio
// operations.
type Device interface {
BeginFrame(viewport image.Point) Framebuffer
BeginFrame(clear bool, viewport image.Point) Framebuffer
EndFrame()
Caps() Caps
NewTimer() Timer
+13 -1
View File
@@ -19,6 +19,7 @@ import (
type Backend struct {
funcs *gl.Functions
clear bool
state glstate
glver [2]int
@@ -171,7 +172,8 @@ func newOpenGLDevice(api driver.OpenGL) (driver.Device, error) {
return b, nil
}
func (b *Backend) BeginFrame(viewport image.Point) driver.Framebuffer {
func (b *Backend) BeginFrame(clear bool, viewport image.Point) driver.Framebuffer {
b.clear = clear
// Assume GL state is reset between frames.
b.state = glstate{}
b.defFBO = gl.Framebuffer(b.funcs.GetBinding(gl.FRAMEBUFFER_BINDING))
@@ -198,6 +200,9 @@ func (b *Backend) BeginFrame(viewport image.Point) driver.Framebuffer {
renderFBO = b.sRGBFBO.Framebuffer()
}
b.funcs.BindFramebuffer(gl.FRAMEBUFFER, renderFBO)
if b.sRGBFBO != nil && !clear {
b.Clear(0, 0, 0, 0)
}
return &gpuFramebuffer{backend: b, obj: renderFBO, foreign: true}
}
@@ -205,8 +210,15 @@ func (b *Backend) EndFrame() {
b.funcs.ActiveTexture(gl.TEXTURE0)
if b.sRGBFBO != nil {
b.funcs.BindFramebuffer(gl.FRAMEBUFFER, b.defFBO)
if b.clear {
b.SetBlend(false)
} else {
b.BlendFunc(driver.BlendFactorOne, driver.BlendFactorOneMinusSrcAlpha)
b.SetBlend(true)
}
b.sRGBFBO.Blit()
}
b.SetBlend(false)
b.funcs.BindFramebuffer(gl.FRAMEBUFFER, b.defFBO)
}