From 6e42f645e406a0dcbfa260f248b969859efa9fb0 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 9 Feb 2015 10:34:22 +0000 Subject: [PATCH] GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT is not enabled directly * 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. --- renderdoc/driver/gl/gl_driver.h | 2 +- renderdoc/driver/gl/gl_renderstate.cpp | 8 ++------ renderdoc/driver/gl/gl_renderstate.h | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/renderdoc/driver/gl/gl_driver.h b/renderdoc/driver/gl/gl_driver.h index 301667dbb..5e0a54df6 100644 --- a/renderdoc/driver/gl/gl_driver.h +++ b/renderdoc/driver/gl/gl_driver.h @@ -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; diff --git a/renderdoc/driver/gl/gl_renderstate.cpp b/renderdoc/driver/gl/gl_renderstate.cpp index cc94a1a30..896da533e 100644 --- a/renderdoc/driver/gl/gl_renderstate.cpp +++ b/renderdoc/driver/gl/gl_renderstate.cpp @@ -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]); diff --git a/renderdoc/driver/gl/gl_renderstate.h b/renderdoc/driver/gl/gl_renderstate.h index 3994b5ebf..f70cafab2 100644 --- a/renderdoc/driver/gl/gl_renderstate.h +++ b/renderdoc/driver/gl/gl_renderstate.h @@ -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,