From 61410d10c3b4551bf71e84670741cc29127bb7ae Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 11 Jan 2017 18:20:21 +0000 Subject: [PATCH] Fix some typos causing mis-aliased functions --- renderdoc/driver/gl/gl_hookset.h | 8 ++++---- renderdoc/driver/gl/gl_hookset_defs.h | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/renderdoc/driver/gl/gl_hookset.h b/renderdoc/driver/gl/gl_hookset.h index 108fe0330..a55fd6962 100644 --- a/renderdoc/driver/gl/gl_hookset.h +++ b/renderdoc/driver/gl/gl_hookset.h @@ -32,8 +32,8 @@ struct GLHookSet { // first we list all the core functions. 1.1 functions are separate under 'dllexport' for - // different handling on windows. Extensions come after - // Any corefunctions that are semantically identical to extension variants are listed as + // different handling on windows. Extensions come after. + // Any Core functions that are semantically identical to extension variants are listed as // 'aliases' such that if the 'alias' is requested via *GetProcAddress, the core function // will be returned and used. @@ -452,8 +452,8 @@ struct GLHookSet PFNGLSAMPLERPARAMETERIUIVPROC glSamplerParameterIuiv; PFNGLPATCHPARAMETERIPROC glPatchParameteri; PFNGLPATCHPARAMETERFVPROC glPatchParameterfv; - PFNGLPOINTPARAMETERFPROC glPointParameterf; // aliases glPointParameterfARB, aliases glPointParameterfEXT - PFNGLPOINTPARAMETERFVPROC glPointParameterfv; // aliases glPointParameterfvARB, aliases glPointParameterfvEXT + PFNGLPOINTPARAMETERFPROC glPointParameterf; // aliases glPointParameterfARB, glPointParameterfEXT + PFNGLPOINTPARAMETERFVPROC glPointParameterfv; // aliases glPointParameterfvARB, glPointParameterfvEXT PFNGLPOINTPARAMETERIPROC glPointParameteri; PFNGLPOINTPARAMETERIVPROC glPointParameteriv; PFNGLDISPATCHCOMPUTEPROC glDispatchCompute; diff --git a/renderdoc/driver/gl/gl_hookset_defs.h b/renderdoc/driver/gl/gl_hookset_defs.h index a9b208508..7adef022c 100644 --- a/renderdoc/driver/gl/gl_hookset_defs.h +++ b/renderdoc/driver/gl/gl_hookset_defs.h @@ -133,10 +133,10 @@ HookExtension(PFNGLMULTIDRAWELEMENTSPROC, glMultiDrawElements); \ HookExtension(PFNGLPOINTPARAMETERFPROC, glPointParameterf); \ HookExtensionAlias(PFNGLPOINTPARAMETERFPROC, glPointParameterf, glPointParameterfARB); \ - HookExtensionAlias(PFNGLPOINTPARAMETERFPROC, glPointParameterf, aliases glPointParameterfEXT); \ + HookExtensionAlias(PFNGLPOINTPARAMETERFPROC, glPointParameterf, glPointParameterfEXT); \ HookExtension(PFNGLPOINTPARAMETERFVPROC, glPointParameterfv); \ HookExtensionAlias(PFNGLPOINTPARAMETERFVPROC, glPointParameterfv, glPointParameterfvARB); \ - HookExtensionAlias(PFNGLPOINTPARAMETERFVPROC, glPointParameterfv, aliases glPointParameterfvEXT); \ + HookExtensionAlias(PFNGLPOINTPARAMETERFVPROC, glPointParameterfv, glPointParameterfvEXT); \ HookExtension(PFNGLPOINTPARAMETERIPROC, glPointParameteri); \ HookExtension(PFNGLPOINTPARAMETERIVPROC, glPointParameteriv); \ HookExtension(PFNGLBLENDCOLORPROC, glBlendColor); \ @@ -2785,8 +2785,6 @@ HookWrapper3(void, glpixeltransformparameterfvext, GLenum, target, GLenum, pname, const GLfloat *, params); \ HookWrapper3(void, glgetpixeltransformparameterivext, GLenum, target, GLenum, pname, GLint *, params); \ HookWrapper3(void, glgetpixeltransformparameterfvext, GLenum, target, GLenum, pname, GLfloat *, params); \ - HookWrapper2(void, glpointparameterfext, GLenum, pname, GLfloat, param); \ - HookWrapper2(void, glpointparameterfvext, GLenum, pname, const GLfloat *, params); \ HookWrapper2(void, glpolygonoffsetext, GLfloat, factor, GLfloat, bias); \ HookWrapper3(void, glsecondarycolor3bext, GLbyte, red, GLbyte, green, GLbyte, blue); \ HookWrapper1(void, glsecondarycolor3bvext, const GLbyte *, v); \ @@ -4600,8 +4598,6 @@ HandleUnsupported(PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC, glpixeltransformparameterfvext); \ HandleUnsupported(PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC, glgetpixeltransformparameterivext); \ HandleUnsupported(PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC, glgetpixeltransformparameterfvext); \ - HandleUnsupported(PFNGLPOINTPARAMETERFEXTPROC, glpointparameterfext); \ - HandleUnsupported(PFNGLPOINTPARAMETERFVEXTPROC, glpointparameterfvext); \ HandleUnsupported(PFNGLPOLYGONOFFSETEXTPROC, glpolygonoffsetext); \ HandleUnsupported(PFNGLSECONDARYCOLOR3BEXTPROC, glsecondarycolor3bext); \ HandleUnsupported(PFNGLSECONDARYCOLOR3BVEXTPROC, glsecondarycolor3bvext); \