mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix code style issue and remove setXfbBufferStride new paramte

Browse Source 
1. Keep the curly braces style.
2. revert a Improper change
This commit is contained in:
Roy 2019-09-04 11:37:56 +08:00
parent b69e8f3aca
commit 35dabea786
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glslang/MachineIndependent/Intermediate.cpp
View File

@ -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;
} }

4
glslang/MachineIndependent/localintermediate.h
View File

@ -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;