From 8926a4213e5dbdf2f63bd84665fdb2ebd4681b84 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sat, 22 Apr 2023 21:20:34 +0900 Subject: [PATCH] internal/graphicsdriver/opengl: refactoring: move consts to gl --- internal/graphicsdriver/opengl/context.go | 48 +++------ internal/graphicsdriver/opengl/gl/const.go | 112 ++++++++++++--------- 2 files changed, 77 insertions(+), 83 deletions(-) diff --git a/internal/graphicsdriver/opengl/context.go b/internal/graphicsdriver/opengl/context.go index 23df2e56b..3be3f5362 100644 --- a/internal/graphicsdriver/opengl/context.go +++ b/internal/graphicsdriver/opengl/context.go @@ -26,52 +26,32 @@ import ( type blendFactor int -const ( - glDstAlpha blendFactor = 0x304 - glDstColor blendFactor = 0x306 - glOne blendFactor = 1 - glOneMinusDstAlpha blendFactor = 0x305 - glOneMinusDstColor blendFactor = 0x307 - glOneMinusSrcAlpha blendFactor = 0x303 - glOneMinusSrcColor blendFactor = 0x301 - glSrcAlpha blendFactor = 0x302 - glSrcAlphaSaturate blendFactor = 0x308 - glSrcColor blendFactor = 0x300 - glZero blendFactor = 0 -) - type blendOperation int -const ( - glFuncAdd blendOperation = 0x8006 - glFuncReverseSubtract blendOperation = 0x800b - glFuncSubtract blendOperation = 0x800a -) - func convertBlendFactor(f graphicsdriver.BlendFactor) blendFactor { switch f { case graphicsdriver.BlendFactorZero: - return glZero + return gl.ZERO case graphicsdriver.BlendFactorOne: - return glOne + return gl.ONE case graphicsdriver.BlendFactorSourceColor: - return glSrcColor + return gl.SRC_COLOR case graphicsdriver.BlendFactorOneMinusSourceColor: - return glOneMinusSrcColor + return gl.ONE_MINUS_SRC_COLOR case graphicsdriver.BlendFactorSourceAlpha: - return glSrcAlpha + return gl.SRC_ALPHA case graphicsdriver.BlendFactorOneMinusSourceAlpha: - return glOneMinusSrcAlpha + return gl.ONE_MINUS_SRC_ALPHA case graphicsdriver.BlendFactorDestinationColor: - return glDstColor + return gl.DST_COLOR case graphicsdriver.BlendFactorOneMinusDestinationColor: - return glOneMinusDstColor + return gl.ONE_MINUS_DST_COLOR case graphicsdriver.BlendFactorDestinationAlpha: - return glDstAlpha + return gl.DST_ALPHA case graphicsdriver.BlendFactorOneMinusDestinationAlpha: - return glOneMinusDstAlpha + return gl.ONE_MINUS_DST_ALPHA case graphicsdriver.BlendFactorSourceAlphaSaturated: - return glSrcAlphaSaturate + return gl.SRC_ALPHA_SATURATE default: panic(fmt.Sprintf("opengl: invalid blend factor %d", f)) } @@ -80,11 +60,11 @@ func convertBlendFactor(f graphicsdriver.BlendFactor) blendFactor { func convertBlendOperation(o graphicsdriver.BlendOperation) blendOperation { switch o { case graphicsdriver.BlendOperationAdd: - return glFuncAdd + return gl.FUNC_ADD case graphicsdriver.BlendOperationSubtract: - return glFuncSubtract + return gl.FUNC_SUBTRACT case graphicsdriver.BlendOperationReverseSubtract: - return glFuncReverseSubtract + return gl.FUNC_REVERSE_SUBTRACT default: panic(fmt.Sprintf("opengl: invalid blend operation %d", o)) } diff --git a/internal/graphicsdriver/opengl/gl/const.go b/internal/graphicsdriver/opengl/gl/const.go index 7c7c226b7..342c282ca 100644 --- a/internal/graphicsdriver/opengl/gl/const.go +++ b/internal/graphicsdriver/opengl/gl/const.go @@ -15,53 +15,67 @@ package gl const ( - ALWAYS = 0x0207 - ARRAY_BUFFER = 0x8892 - BLEND = 0x0BE2 - CLAMP_TO_EDGE = 0x812F - COLOR_ATTACHMENT0 = 0x8CE0 - COMPILE_STATUS = 0x8B81 - DEPTH24_STENCIL8 = 0x88F0 - DYNAMIC_DRAW = 0x88E8 - ELEMENT_ARRAY_BUFFER = 0x8893 - FALSE = 0 - FLOAT = 0x1406 - FRAGMENT_SHADER = 0x8B30 - FRAMEBUFFER = 0x8D40 - FRAMEBUFFER_BINDING = 0x8CA6 - FRAMEBUFFER_COMPLETE = 0x8CD5 - HIGH_FLOAT = 0x8DF2 - INFO_LOG_LENGTH = 0x8B84 - INVERT = 0x150A - KEEP = 0x1E00 - LINK_STATUS = 0x8B82 - MAX_TEXTURE_SIZE = 0x0D33 - NEAREST = 0x2600 - NO_ERROR = 0 - NOTEQUAL = 0x0205 - PIXEL_PACK_BUFFER = 0x88EB - PIXEL_UNPACK_BUFFER = 0x88EC - READ_WRITE = 0x88BA - RENDERBUFFER = 0x8D41 - RGBA = 0x1908 - SCISSOR_TEST = 0x0C11 - SHORT = 0x1402 - STENCIL_ATTACHMENT = 0x8D20 - STENCIL_BUFFER_BIT = 0x0400 - STENCIL_INDEX8 = 0x8D48 - STENCIL_TEST = 0x0B90 - STREAM_DRAW = 0x88E0 - TEXTURE0 = 0x84C0 - TEXTURE_2D = 0x0DE1 - TEXTURE_MAG_FILTER = 0x2800 - TEXTURE_MIN_FILTER = 0x2801 - TEXTURE_WRAP_S = 0x2802 - TEXTURE_WRAP_T = 0x2803 - TRIANGLES = 0x0004 - TRUE = 1 - UNPACK_ALIGNMENT = 0x0CF5 - UNSIGNED_BYTE = 0x1401 - UNSIGNED_SHORT = 0x1403 - VERTEX_SHADER = 0x8B31 - WRITE_ONLY = 0x88B9 + ALWAYS = 0x0207 + ARRAY_BUFFER = 0x8892 + BLEND = 0x0BE2 + CLAMP_TO_EDGE = 0x812F + COLOR_ATTACHMENT0 = 0x8CE0 + COMPILE_STATUS = 0x8B81 + DEPTH24_STENCIL8 = 0x88F0 + DST_ALPHA = 0x0304 + DST_COLOR = 0x0306 + DYNAMIC_DRAW = 0x88E8 + ELEMENT_ARRAY_BUFFER = 0x8893 + FALSE = 0 + FLOAT = 0x1406 + FRAGMENT_SHADER = 0x8B30 + FRAMEBUFFER = 0x8D40 + FRAMEBUFFER_BINDING = 0x8CA6 + FRAMEBUFFER_COMPLETE = 0x8CD5 + FUNC_ADD = 0x8006 + FUNC_REVERSE_SUBTRACT = 0x800b + FUNC_SUBTRACT = 0x800a + HIGH_FLOAT = 0x8DF2 + INFO_LOG_LENGTH = 0x8B84 + INVERT = 0x150A + KEEP = 0x1E00 + LINK_STATUS = 0x8B82 + MAX_TEXTURE_SIZE = 0x0D33 + NEAREST = 0x2600 + NO_ERROR = 0 + NOTEQUAL = 0x0205 + ONE = 1 + ONE_MINUS_DST_ALPHA = 0x0305 + ONE_MINUS_DST_COLOR = 0x0307 + ONE_MINUS_SRC_ALPHA = 0x0303 + ONE_MINUS_SRC_COLOR = 0x0301 + PIXEL_PACK_BUFFER = 0x88EB + PIXEL_UNPACK_BUFFER = 0x88EC + READ_WRITE = 0x88BA + RENDERBUFFER = 0x8D41 + RGBA = 0x1908 + SCISSOR_TEST = 0x0C11 + SHORT = 0x1402 + SRC_ALPHA = 0x0302 + SRC_ALPHA_SATURATE = 0x0308 + SRC_COLOR = 0x0300 + STENCIL_ATTACHMENT = 0x8D20 + STENCIL_BUFFER_BIT = 0x0400 + STENCIL_INDEX8 = 0x8D48 + STENCIL_TEST = 0x0B90 + STREAM_DRAW = 0x88E0 + TEXTURE0 = 0x84C0 + TEXTURE_2D = 0x0DE1 + TEXTURE_MAG_FILTER = 0x2800 + TEXTURE_MIN_FILTER = 0x2801 + TEXTURE_WRAP_S = 0x2802 + TEXTURE_WRAP_T = 0x2803 + TRIANGLES = 0x0004 + TRUE = 1 + UNPACK_ALIGNMENT = 0x0CF5 + UNSIGNED_BYTE = 0x1401 + UNSIGNED_SHORT = 0x1403 + VERTEX_SHADER = 0x8B31 + WRITE_ONLY = 0x88B9 + ZERO = 0 )