From 37c5f538906e73c70bf61c695ac071feeb88b347 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sat, 15 Oct 2022 22:14:21 +0900 Subject: [PATCH] internal/graphicsdriver/opengl: refactoring --- internal/graphicsdriver/opengl/context.go | 24 +++++++++++++------ internal/graphicsdriver/opengl/context_gl.go | 10 -------- .../graphicsdriver/opengl/context_gles.go | 10 -------- internal/graphicsdriver/opengl/context_js.go | 10 -------- internal/graphicsdriver/opengl/gl/package.go | 8 ------- internal/graphicsdriver/opengl/gles/const.go | 8 ------- 6 files changed, 17 insertions(+), 53 deletions(-) diff --git a/internal/graphicsdriver/opengl/context.go b/internal/graphicsdriver/opengl/context.go index c36779759..3cdbc6c58 100644 --- a/internal/graphicsdriver/opengl/context.go +++ b/internal/graphicsdriver/opengl/context.go @@ -23,22 +23,32 @@ import ( type blendFactor int +const ( + glDstAlpha blendFactor = 0x0304 + glDstColor blendFactor = 0x0306 + glOne blendFactor = 1 + glOneMinusDstAlpha blendFactor = 0x0305 + glOneMinusSrcAlpha blendFactor = 0x0303 + glSrcAlpha blendFactor = 0x0302 + glZero blendFactor = 0 +) + func convertBlendFactor(op graphicsdriver.BlendFactor) blendFactor { switch op { case graphicsdriver.BlendFactorZero: - return zero + return glZero case graphicsdriver.BlendFactorOne: - return one + return glOne case graphicsdriver.BlendFactorSourceAlpha: - return srcAlpha + return glSrcAlpha case graphicsdriver.BlendFactorDestinationAlpha: - return dstAlpha + return glDstAlpha case graphicsdriver.BlendFactorOneMinusSourceAlpha: - return oneMinusSrcAlpha + return glOneMinusSrcAlpha case graphicsdriver.BlendFactorOneMinusDestinationAlpha: - return oneMinusDstAlpha + return glOneMinusDstAlpha case graphicsdriver.BlendFactorDestinationColor: - return dstColor + return glDstColor default: panic(fmt.Sprintf("opengl: invalid blend factor %d at convertBlendFactor", op)) } diff --git a/internal/graphicsdriver/opengl/context_gl.go b/internal/graphicsdriver/opengl/context_gl.go index 24f68781c..347362595 100644 --- a/internal/graphicsdriver/opengl/context_gl.go +++ b/internal/graphicsdriver/opengl/context_gl.go @@ -82,16 +82,6 @@ func getProgramID(p program) programID { return programID(p) } -const ( - zero = blendFactor(gl.ZERO) - one = blendFactor(gl.ONE) - srcAlpha = blendFactor(gl.SRC_ALPHA) - dstAlpha = blendFactor(gl.DST_ALPHA) - oneMinusSrcAlpha = blendFactor(gl.ONE_MINUS_SRC_ALPHA) - oneMinusDstAlpha = blendFactor(gl.ONE_MINUS_DST_ALPHA) - dstColor = blendFactor(gl.DST_COLOR) -) - type contextImpl struct { init bool } diff --git a/internal/graphicsdriver/opengl/context_gles.go b/internal/graphicsdriver/opengl/context_gles.go index e9d9f8db6..55063ede1 100644 --- a/internal/graphicsdriver/opengl/context_gles.go +++ b/internal/graphicsdriver/opengl/context_gles.go @@ -82,16 +82,6 @@ func getProgramID(p program) programID { return programID(p) } -const ( - zero = blendFactor(gles.ZERO) - one = blendFactor(gles.ONE) - srcAlpha = blendFactor(gles.SRC_ALPHA) - dstAlpha = blendFactor(gles.DST_ALPHA) - oneMinusSrcAlpha = blendFactor(gles.ONE_MINUS_SRC_ALPHA) - oneMinusDstAlpha = blendFactor(gles.ONE_MINUS_DST_ALPHA) - dstColor = blendFactor(gles.DST_COLOR) -) - type contextImpl struct { ctx gles.Context } diff --git a/internal/graphicsdriver/opengl/context_js.go b/internal/graphicsdriver/opengl/context_js.go index df7f44cb7..30a2d754c 100644 --- a/internal/graphicsdriver/opengl/context_js.go +++ b/internal/graphicsdriver/opengl/context_js.go @@ -79,16 +79,6 @@ func getProgramID(p program) programID { return p.id } -const ( - zero = blendFactor(gles.ZERO) - one = blendFactor(gles.ONE) - srcAlpha = blendFactor(gles.SRC_ALPHA) - dstAlpha = blendFactor(gles.DST_ALPHA) - oneMinusSrcAlpha = blendFactor(gles.ONE_MINUS_SRC_ALPHA) - oneMinusDstAlpha = blendFactor(gles.ONE_MINUS_DST_ALPHA) - dstColor = blendFactor(gles.DST_COLOR) -) - type webGLVersion int const ( diff --git a/internal/graphicsdriver/opengl/gl/package.go b/internal/graphicsdriver/opengl/gl/package.go index c5e4435d0..73d601f0a 100644 --- a/internal/graphicsdriver/opengl/gl/package.go +++ b/internal/graphicsdriver/opengl/gl/package.go @@ -16,14 +16,6 @@ package gl const ( - ZERO = 0 - ONE = 1 - SRC_ALPHA = 0x0302 - DST_ALPHA = 0x0304 - ONE_MINUS_SRC_ALPHA = 0x0303 - ONE_MINUS_DST_ALPHA = 0x0305 - DST_COLOR = 0x0306 - ALWAYS = 0x0207 ARRAY_BUFFER = 0x8892 BLEND = 0x0BE2 diff --git a/internal/graphicsdriver/opengl/gles/const.go b/internal/graphicsdriver/opengl/gles/const.go index b0f628b74..125ce7680 100644 --- a/internal/graphicsdriver/opengl/gles/const.go +++ b/internal/graphicsdriver/opengl/gles/const.go @@ -16,14 +16,6 @@ package gles const ( - ZERO = 0 - ONE = 1 - SRC_ALPHA = 0x0302 - DST_ALPHA = 0x0304 - ONE_MINUS_SRC_ALPHA = 0x0303 - ONE_MINUS_DST_ALPHA = 0x0305 - DST_COLOR = 0x0306 - ALWAYS = 0x0207 ARRAY_BUFFER = 0x8892 BLEND = 0x0BE2