Skip to content

S
swiftshader
Commit 3345779e by Alexis Hetu Committed by Alexis Hétu
Options

Minor cleanups

A few minor things fell through the cracks of previously landed cls: - Added missing ops from TOutputTraverser::visitAggregate - Made sure some members were initialized in TIntermAggregate - Removed UNIMPLEMENTED() for implemented feature Change-Id: Iec139533714ad6288f2f3962873616b5578a0ceb Reviewed-on: https://swiftshader-review.googlesource.com/5480Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 112d81f1
Showing with 12 additions and 2 deletions
src/OpenGL/compiler/intermOut.cpp
...@@ -277,7 +277,13 @@ bool TOutputTraverser::visitAggregate(Visit visit, TIntermAggregate* node) ...@@ -277,7 +277,13 @@ bool TOutputTraverser::visitAggregate(Visit visit, TIntermAggregate* node)
case EOpConstructUVec3: out << "Construct uvec3"; break; case EOpConstructUVec3: out << "Construct uvec3"; break;
case EOpConstructUVec4: out << "Construct uvec4"; break; case EOpConstructUVec4: out << "Construct uvec4"; break;
case EOpConstructMat2: out << "Construct mat2"; break; case EOpConstructMat2: out << "Construct mat2"; break;
case EOpConstructMat2x3: out << "Construct mat2x3"; break;
case EOpConstructMat2x4: out << "Construct mat2x4"; break;
case EOpConstructMat3x2: out << "Construct mat3x2"; break;
case EOpConstructMat3: out << "Construct mat3"; break; case EOpConstructMat3: out << "Construct mat3"; break;
case EOpConstructMat3x4: out << "Construct mat3x4"; break;
case EOpConstructMat4x2: out << "Construct mat4x2"; break;
case EOpConstructMat4x3: out << "Construct mat4x3"; break;
case EOpConstructMat4: out << "Construct mat4"; break; case EOpConstructMat4: out << "Construct mat4"; break;
case EOpConstructStruct: out << "Construct structure"; break; case EOpConstructStruct: out << "Construct structure"; break;
...@@ -301,6 +307,11 @@ bool TOutputTraverser::visitAggregate(Visit visit, TIntermAggregate* node) ...@@ -301,6 +307,11 @@ bool TOutputTraverser::visitAggregate(Visit visit, TIntermAggregate* node)
case EOpStep: out << "step"; break; case EOpStep: out << "step"; break;
case EOpSmoothStep: out << "smoothstep"; break; case EOpSmoothStep: out << "smoothstep"; break;
case EOpFloatBitsToInt: out << "floatBitsToInt"; break;
case EOpFloatBitsToUint: out << "floatBitsToUint"; break;
case EOpIntBitsToFloat: out << "intBitsToFloat"; break;
case EOpUintBitsToFloat: out << "uintBitsToFloat"; break;
case EOpDistance: out << "distance"; break; case EOpDistance: out << "distance"; break;
case EOpDot: out << "dot-product"; break; case EOpDot: out << "dot-product"; break;
case EOpCross: out << "cross-product"; break; case EOpCross: out << "cross-product"; break;
......
src/OpenGL/compiler/intermediate.h
...@@ -537,7 +537,7 @@ typedef TVector<int> TQualifierList; ...@@ -537,7 +537,7 @@ typedef TVector<int> TQualifierList;
class TIntermAggregate : public TIntermOperator { class TIntermAggregate : public TIntermOperator {
public: public:
TIntermAggregate() : TIntermOperator(EOpNull), userDefined(false) { endLine = { 0, 0, 0, 0 }; } TIntermAggregate() : TIntermOperator(EOpNull), userDefined(false) { endLine = { 0, 0, 0, 0 }; }
TIntermAggregate(TOperator o) : TIntermOperator(o) { } TIntermAggregate(TOperator o) : TIntermOperator(o), userDefined(false) { endLine = { 0, 0, 0, 0 }; }
~TIntermAggregate() { } ~TIntermAggregate() { }
virtual TIntermAggregate* getAsAggregate() { return this; } virtual TIntermAggregate* getAsAggregate() { return this; }
......
src/OpenGL/libGLESv2/Context.cpp
...@@ -2174,7 +2174,6 @@ template<typename T> bool Context::getIntegerv(GLenum pname, T *params) const ...@@ -2174,7 +2174,6 @@ template<typename T> bool Context::getIntegerv(GLenum pname, T *params) const
*params = sw::MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS; *params = sw::MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS;
break; break;
case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS: // integer, at least 4 case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS: // integer, at least 4
UNIMPLEMENTED();
*params = MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS; *params = MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS;
break; break;
case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS: // integer, at least 4 case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS: // integer, at least 4
......
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