mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-13 05:20:45 +00:00
Add OpenGL ES extension header to fetch enums from.
* There's a minor conflict over GL_ACTIVE_PROGRAM_EXT being defined to different values in GLES and GL extension headers. Since in the GL extension header it's defined to the value that eventually became GL_CURRENT_PROGRAM we remove that define.
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -7768,7 +7768,23 @@ GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei
|
||||
|
||||
#ifndef GL_EXT_separate_shader_objects
|
||||
#define GL_EXT_separate_shader_objects 1
|
||||
#define GL_ACTIVE_PROGRAM_EXT 0x8B8D
|
||||
// This define has a clash with GLES extensions defined GL_ACTIVE_PROGRAM_EXT:
|
||||
//
|
||||
// official/glcorearb.h: GL_ACTIVE_PROGRAM 0x8259
|
||||
// official/glesext.h: GL_ACTIVE_PROGRAM_EXT 0x8259
|
||||
// official/glext.h: GL_ACTIVE_PROGRAM 0x8259
|
||||
//
|
||||
// official/glcorearb.h: GL_CURRENT_PROGRAM 0x8B8D
|
||||
// official/glext.h: GL_CURRENT_PROGRAM 0x8B8D
|
||||
// official/glext.h: GL_ACTIVE_PROGRAM_EXT 0x8B8D
|
||||
//
|
||||
// Also in the GLES core headers, GL_CURRENT_PROGRAM is 0x8B8D
|
||||
//
|
||||
// So since this is the odd-one-out in a sense, and since we don't need any of
|
||||
// the _EXT variant enums ourselves, we comment this one out. If we see 0x8B8D
|
||||
// we'll consider it as GL_CURRENT_PROGRAM.
|
||||
//
|
||||
//_define GL_ACTIVE_PROGRAM_EXT 0x8B8D
|
||||
typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
|
||||
typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
|
||||
typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string);
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
<PreprocessorDefinitions>RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
||||
@@ -109,7 +109,11 @@
|
||||
<ClInclude Include="gl_replay.h" />
|
||||
<ClInclude Include="gl_resources.h" />
|
||||
<ClInclude Include="gl_shader_refl.h" />
|
||||
<ClInclude Include="official\egl.h" />
|
||||
<ClInclude Include="official\eglext.h" />
|
||||
<ClInclude Include="official\eglplatform.h" />
|
||||
<ClInclude Include="official\glcorearb.h" />
|
||||
<ClInclude Include="official\glesext.h" />
|
||||
<ClInclude Include="official\glext.h" />
|
||||
<ClInclude Include="official\wglext.h" />
|
||||
<ClInclude Include="precompiled.h" />
|
||||
|
||||
@@ -87,6 +87,18 @@
|
||||
<ClInclude Include="precompiled.h">
|
||||
<Filter>PCH</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="official\egl.h">
|
||||
<Filter>ARB Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="official\eglext.h">
|
||||
<Filter>ARB Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="official\eglplatform.h">
|
||||
<Filter>ARB Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="official\glesext.h">
|
||||
<Filter>ARB Headers</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="wrappers\gl_buffer_funcs.cpp">
|
||||
|
||||
Reference in New Issue
Block a user