Commit 8833e016 by Nicolas Capens

Fix potentially uninitialized variables.

Bug 15387371 Change-Id: Ie0486feeebc6e4bceba148bea69f2d1ee1d1ffd8 Reviewed-on: https://swiftshader-review.googlesource.com/4499Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent 50f1a73b
...@@ -1439,17 +1439,10 @@ void Context::endQuery(GLenum target) ...@@ -1439,17 +1439,10 @@ void Context::endQuery(GLenum target)
switch(target) switch(target)
{ {
case GL_ANY_SAMPLES_PASSED_EXT: case GL_ANY_SAMPLES_PASSED_EXT: qType = QUERY_ANY_SAMPLES_PASSED; break;
qType = QUERY_ANY_SAMPLES_PASSED; case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT: qType = QUERY_ANY_SAMPLES_PASSED_CONSERVATIVE; break;
break; case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: qType = QUERY_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN; break;
case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT: default: UNREACHABLE(target); return;
qType = QUERY_ANY_SAMPLES_PASSED_CONSERVATIVE;
break;
case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
qType = QUERY_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN;
break;
default:
ASSERT(false);
} }
Query *queryObject = mState.activeQuery[qType]; Query *queryObject = mState.activeQuery[qType];
......
...@@ -2989,7 +2989,7 @@ void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenu ...@@ -2989,7 +2989,7 @@ void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenu
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
} }
GLenum attachmentObjectType; // Type category GLenum attachmentObjectType = GL_NONE; // Type category
if(attachmentType == GL_NONE || attachmentType == GL_RENDERBUFFER) if(attachmentType == GL_NONE || attachmentType == GL_RENDERBUFFER)
{ {
attachmentObjectType = attachmentType; attachmentObjectType = attachmentType;
......
...@@ -1348,8 +1348,7 @@ namespace sw ...@@ -1348,8 +1348,7 @@ namespace sw
case Shader::PARAMETER_TEXTURE: reg = &r.ts[i]; break; case Shader::PARAMETER_TEXTURE: reg = &r.ts[i]; break;
case Shader::PARAMETER_VOID: return r.rs[0]; // Dummy case Shader::PARAMETER_VOID: return r.rs[0]; // Dummy
case Shader::PARAMETER_FLOAT4LITERAL: return r.rs[0]; // Dummy case Shader::PARAMETER_FLOAT4LITERAL: return r.rs[0]; // Dummy
default: default: ASSERT(false); return r.rs[0];
ASSERT(false);
} }
const Short4 &x = (*reg)[(src.swizzle >> 0) & 0x3]; const Short4 &x = (*reg)[(src.swizzle >> 0) & 0x3];
......
...@@ -1111,7 +1111,7 @@ namespace sw ...@@ -1111,7 +1111,7 @@ namespace sw
majorVersion = (unsigned char)((token[0] & 0x0000FF00) >> 8); majorVersion = (unsigned char)((token[0] & 0x0000FF00) >> 8);
shaderType = (ShaderType)((token[0] & 0xFFFF0000) >> 16); shaderType = (ShaderType)((token[0] & 0xFFFF0000) >> 16);
int length; int length = 0;
if(shaderType == SHADER_VERTEX) if(shaderType == SHADER_VERTEX)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment