Skip to content

G
glslang
Commit 35dabea7 by Roy
Options

Fix code style issue and remove setXfbBufferStride new paramte

1. Keep the curly braces style. 2. revert a Improper change
parent b69e8f3a
Showing with 3 additions and 4 deletions
glslang/MachineIndependent/Intermediate.cpp
...@@ -839,8 +839,7 @@ TIntermTyped* TIntermediate::createConversion(TBasicType convertTo, TIntermTyped ...@@ -839,8 +839,7 @@ TIntermTyped* TIntermediate::createConversion(TBasicType convertTo, TIntermTyped
return nullptr; return nullptr;
} }
if (!buildConvertOp(convertTo, node->getBasicType(), newOp)) if (!buildConvertOp(convertTo, node->getBasicType(), newOp)) {
{
return nullptr; return nullptr;
} }
......
glslang/MachineIndependent/localintermediate.h
...@@ -693,9 +693,9 @@ public: ...@@ -693,9 +693,9 @@ public:
bool getPixelCenterInteger() const { return pixelCenterInteger; } bool getPixelCenterInteger() const { return pixelCenterInteger; }
void addBlendEquation(TBlendEquationShift b) { blendEquations |= (1 << b); } void addBlendEquation(TBlendEquationShift b) { blendEquations |= (1 << b); }
unsigned int getBlendEquations() const { return blendEquations; } unsigned int getBlendEquations() const { return blendEquations; }
bool setXfbBufferStride(int buffer, unsigned stride, bool force = false) bool setXfbBufferStride(int buffer, unsigned stride)
{ {
if (xfbBuffers[buffer].stride != TQualifier::layoutXfbStrideEnd && force == false) if (xfbBuffers[buffer].stride != TQualifier::layoutXfbStrideEnd)
return xfbBuffers[buffer].stride == stride; return xfbBuffers[buffer].stride == stride;
xfbBuffers[buffer].stride = stride; xfbBuffers[buffer].stride = stride;
return true; return true;
......
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