From 038bcff10692fece1184570b0f71f0826f3e8db1 Mon Sep 17 00:00:00 2001 From: Baldur Karlsson Date: Tue, 24 Jun 2014 15:55:31 +0100 Subject: [PATCH] GL_TEXTURE_SWIZZLE_RGBA is 4 parameters not 1 --- renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp index bf4afadb6..6ce186fa1 100644 --- a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp @@ -404,7 +404,7 @@ bool WrappedOpenGL::Serialise_glTextureParameterivEXT(GLuint texture, GLenum tar SERIALISE_ELEMENT(GLenum, Target, target); SERIALISE_ELEMENT(GLenum, PName, pname); SERIALISE_ELEMENT(ResourceId, id, GetResourceManager()->GetID(TextureRes(texture))); - const size_t nParams = (PName == eGL_TEXTURE_BORDER_COLOR ? 4U : 1U); + const size_t nParams = (PName == eGL_TEXTURE_BORDER_COLOR || PName == eGL_TEXTURE_SWIZZLE_RGBA ? 4U : 1U); SERIALISE_ELEMENT_ARR(int32_t, Params, params, nParams); if(m_State < WRITING) @@ -515,7 +515,7 @@ bool WrappedOpenGL::Serialise_glTextureParameterfvEXT(GLuint texture, GLenum tar SERIALISE_ELEMENT(GLenum, Target, target); SERIALISE_ELEMENT(GLenum, PName, pname); SERIALISE_ELEMENT(ResourceId, id, GetResourceManager()->GetID(TextureRes(texture))); - const size_t nParams = (PName == eGL_TEXTURE_BORDER_COLOR ? 4U : 1U); + const size_t nParams = (PName == eGL_TEXTURE_BORDER_COLOR || PName == eGL_TEXTURE_SWIZZLE_RGBA ? 4U : 1U); SERIALISE_ELEMENT_ARR(float, Params, params, nParams); if(m_State < WRITING)