From 9ff90117f87a7b5dc7e958c8b5dbf551b69889b5 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 30 Jan 2019 19:47:26 +0000 Subject: [PATCH] Add glBlendEquationARB alias for glBlendEquation --- renderdoc/driver/gl/gl_common.h | 2 ++ renderdoc/driver/gl/gl_dispatch_table.h | 2 +- renderdoc/driver/gl/gl_dispatch_table_defs.h | 2 ++ renderdoc/driver/gl/gl_driver.cpp | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/renderdoc/driver/gl/gl_common.h b/renderdoc/driver/gl/gl_common.h index 05c1de1ec..f6f425dbc 100644 --- a/renderdoc/driver/gl/gl_common.h +++ b/renderdoc/driver/gl/gl_common.h @@ -2099,6 +2099,8 @@ enum class GLChunk : uint32_t glGetPerfQueryIdByNameINTEL, glGetPerfQueryInfoINTEL, + glBlendEquationARB, + Max, }; diff --git a/renderdoc/driver/gl/gl_dispatch_table.h b/renderdoc/driver/gl/gl_dispatch_table.h index f5b06647d..6bfb81b9f 100644 --- a/renderdoc/driver/gl/gl_dispatch_table.h +++ b/renderdoc/driver/gl/gl_dispatch_table.h @@ -235,7 +235,7 @@ struct GLDispatchTable PFNGLBLENDFUNCIPROC glBlendFunci; // aliases glBlendFunciARB, glBlendFunciEXT, glBlendFunciOES PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate; // aliases glBlendFuncSeparateARB PFNGLBLENDFUNCSEPARATEIPROC glBlendFuncSeparatei; // aliases glBlendFuncSeparateiARB, glBlendFuncSeparateiEXT, glBlendFuncSeparateiOES - PFNGLBLENDEQUATIONPROC glBlendEquation; // aliases glBlendEquationEXT + PFNGLBLENDEQUATIONPROC glBlendEquation; // aliases glBlendEquationEXT, glBlendEquationARB PFNGLBLENDEQUATIONIPROC glBlendEquationi; // aliases glBlendEquationiARB, glBlendEquationiEXT, glBlendEquationiOES PFNGLBLENDEQUATIONSEPARATEPROC glBlendEquationSeparate; // aliases glBlendEquationSeparateARB, glBlendEquationSeparateEXT PFNGLBLENDEQUATIONSEPARATEIPROC glBlendEquationSeparatei; // aliases glBlendEquationSeparateiARB, glBlendEquationSeparateiEXT, glBlendEquationSeparateiOES diff --git a/renderdoc/driver/gl/gl_dispatch_table_defs.h b/renderdoc/driver/gl/gl_dispatch_table_defs.h index 0726534d7..4475101e6 100644 --- a/renderdoc/driver/gl/gl_dispatch_table_defs.h +++ b/renderdoc/driver/gl/gl_dispatch_table_defs.h @@ -313,6 +313,7 @@ FUNC(glBlendFuncSeparatei, glBlendFuncSeparateiOES); \ FUNC(glBlendEquation, glBlendEquation); \ FUNC(glBlendEquation, glBlendEquationEXT); \ + FUNC(glBlendEquation, glBlendEquationARB); \ FUNC(glBlendEquationi, glBlendEquationi); \ FUNC(glBlendEquationi, glBlendEquationiARB); \ FUNC(glBlendEquationi, glBlendEquationiEXT); \ @@ -1572,6 +1573,7 @@ AliasWrapper5(void, glBlendFuncSeparateiOES, glBlendFuncSeparatei, GLuint, buf, GLenum, srcRGB, GLenum, dstRGB, GLenum, srcAlpha, GLenum, dstAlpha); \ FuncWrapper1(void, glBlendEquation, GLenum, mode); \ AliasWrapper1(void, glBlendEquationEXT, glBlendEquation, GLenum, mode); \ + AliasWrapper1(void, glBlendEquationARB, glBlendEquation, GLenum, mode); \ FuncWrapper2(void, glBlendEquationi, GLuint, buf, GLenum, mode); \ AliasWrapper2(void, glBlendEquationiARB, glBlendEquationi, GLuint, buf, GLenum, mode); \ AliasWrapper2(void, glBlendEquationiEXT, glBlendEquationi, GLuint, buf, GLenum, mode); \ diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index d0254c699..866c1ccf8 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -3480,6 +3480,7 @@ bool WrappedOpenGL::ProcessChunk(ReadSerialiser &ser, GLChunk chunk) case GLChunk::glBlendFuncSeparatei: return Serialise_glBlendFuncSeparatei(ser, 0, eGL_NONE, eGL_NONE, eGL_NONE, eGL_NONE); case GLChunk::glBlendEquationEXT: + case GLChunk::glBlendEquationARB: case GLChunk::glBlendEquation: return Serialise_glBlendEquation(ser, eGL_NONE); case GLChunk::glBlendEquationiARB: case GLChunk::glBlendEquationiEXT: