lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-21 14:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT is not enabled directly

Browse Source 
* It's only used in glRasterSamplesEXT, so it's an error to either
  glEnable/glDisable it or check via glIsEnabled. It's already handled
  properly to RasterFixed, so just drop it from the enabled bits.
This commit is contained in:
baldurk
2015-02-09 10:34:22 +00:00
parent 6f711a3470
commit 6e42f645e4
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_driver.h
+1 -1
View File
@@ -55,7 +55,7 @@ struct GLInitParams : public RDCInitParams
uint32_t width;
uint32_t height;
static const uint32_t GL_SERIALISE_VERSION = 0x0000006;
static const uint32_t GL_SERIALISE_VERSION = 0x0000007;
// version number internal to opengl stream
uint32_t SerialiseVersion;
renderdoc/driver/gl/gl_renderstate.cpp
+2 -6
View File
@@ -274,7 +274,6 @@ void GLRenderState::FetchState(void *ctx, WrappedOpenGL *gl)
eGL_SAMPLE_MASK,
eGL_SAMPLE_SHADING,
eGL_RASTER_MULTISAMPLE_EXT,
eGL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT,
eGL_STENCIL_TEST,
eGL_TEXTURE_CUBE_MAP_SEAMLESS,
eGL_BLEND_ADVANCED_COHERENT_KHR,
@@ -291,8 +290,7 @@ void GLRenderState::FetchState(void *ctx, WrappedOpenGL *gl)
continue;
}
if((pnames[i] == eGL_RASTER_MULTISAMPLE_EXT || pnames[i] == eGL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT)
&& !ExtensionSupported[ExtensionSupported_EXT_raster_multisample])
if(pnames[i] == eGL_RASTER_MULTISAMPLE_EXT && !ExtensionSupported[ExtensionSupported_EXT_raster_multisample])
{
Enabled[i] = false;
continue;
@@ -598,7 +596,6 @@ void GLRenderState::ApplyState(void *ctx, WrappedOpenGL *gl)
eGL_SAMPLE_MASK,
eGL_SAMPLE_SHADING,
eGL_RASTER_MULTISAMPLE_EXT,
eGL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT,
eGL_STENCIL_TEST,
eGL_TEXTURE_CUBE_MAP_SEAMLESS,
eGL_BLEND_ADVANCED_COHERENT_KHR,
@@ -612,8 +609,7 @@ void GLRenderState::ApplyState(void *ctx, WrappedOpenGL *gl)
if(pnames[i] == eGL_BLEND_ADVANCED_COHERENT_KHR && !ExtensionSupported[ExtensionSupported_KHR_blend_equation_advanced_coherent])
continue;
if((pnames[i] == eGL_RASTER_MULTISAMPLE_EXT || pnames[i] == eGL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT)
&& !ExtensionSupported[ExtensionSupported_EXT_raster_multisample])
if(pnames[i] == eGL_RASTER_MULTISAMPLE_EXT && !ExtensionSupported[ExtensionSupported_EXT_raster_multisample])
continue;
if(Enabled[i]) m_Real->glEnable(pnames[i]); else m_Real->glDisable(pnames[i]);
renderdoc/driver/gl/gl_renderstate.h
-1
View File
@@ -91,7 +91,6 @@ struct GLRenderState
eEnabled_SampleMask,
eEnabled_SampleShading,
eEnabled_RasterMultisample,
eEnabled_RasterMultisampleFixed,
//eEnabled_ScissorTest, handled below with scissor values
eEnabled_StencilTest,
eEnabled_TexCubeSeamless,