@@ -614,8 +614,8 @@ class GLUniform1i : protected GLUniform
614614 {
615615 ShaderProgramDescriptor *p = _shader->GetProgram ();
616616
617- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
618- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
617+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
618+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
619619 currentValue = value;
620620 return ;
621621 }
@@ -658,8 +658,8 @@ class GLUniform1ui : protected GLUniform {
658658 inline void SetValue ( uint value ) {
659659 ShaderProgramDescriptor* p = _shader->GetProgram ();
660660
661- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
662- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
661+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
662+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
663663 currentValue = value;
664664 return ;
665665 }
@@ -701,8 +701,8 @@ class GLUniform1Bool : protected GLUniform {
701701 inline void SetValue ( int value ) {
702702 ShaderProgramDescriptor* p = _shader->GetProgram ();
703703
704- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
705- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
704+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
705+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
706706 currentValue = value;
707707 return ;
708708 }
@@ -747,8 +747,8 @@ class GLUniform1f : protected GLUniform
747747 {
748748 ShaderProgramDescriptor *p = _shader->GetProgram ();
749749
750- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
751- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
750+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
751+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
752752 currentValue = value;
753753 return ;
754754 }
@@ -795,8 +795,8 @@ class GLUniform1fv : protected GLUniform
795795 {
796796 ShaderProgramDescriptor *p = _shader->GetProgram ();
797797
798- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
799- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
798+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
799+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
800800 memcpy ( currentValue.data (), f, numFloats * sizeof ( float ) );
801801 return ;
802802 }
@@ -829,8 +829,8 @@ class GLUniform2f : protected GLUniform
829829 {
830830 ShaderProgramDescriptor *p = _shader->GetProgram ();
831831
832- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
833- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
832+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
833+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
834834 Vector2Copy ( v, currentValue );
835835 return ;
836836 }
@@ -880,8 +880,8 @@ class GLUniform3f : protected GLUniform
880880 {
881881 ShaderProgramDescriptor *p = _shader->GetProgram ();
882882
883- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
884- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
883+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
884+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
885885 VectorCopy ( v, currentValue );
886886 return ;
887887 }
@@ -931,8 +931,8 @@ class GLUniform4f : protected GLUniform
931931 {
932932 ShaderProgramDescriptor *p = _shader->GetProgram ();
933933
934- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
935- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
934+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
935+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
936936 Vector4Copy ( v, currentValue );
937937 return ;
938938 }
@@ -979,8 +979,8 @@ class GLUniform4fv : protected GLUniform
979979 {
980980 ShaderProgramDescriptor *p = _shader->GetProgram ();
981981
982- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
983- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
982+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
983+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
984984 memcpy ( currentValue.data (), v, numV * sizeof ( vec4_t ) );
985985 return ;
986986 }
@@ -1013,8 +1013,8 @@ class GLUniformMatrix4f : protected GLUniform
10131013 {
10141014 ShaderProgramDescriptor *p = _shader->GetProgram ();
10151015
1016- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
1017- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
1016+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
1017+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
10181018 MatrixCopy ( m, currentValue );
10191019 return ;
10201020 }
@@ -1057,8 +1057,8 @@ class GLUniformMatrix32f : protected GLUniform {
10571057 inline void SetValue ( GLboolean transpose, const vec_t * m ) {
10581058 ShaderProgramDescriptor* p = _shader->GetProgram ();
10591059
1060- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
1061- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
1060+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
1061+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
10621062 memcpy ( currentValue, m, 6 * sizeof ( float ) );
10631063 return ;
10641064 }
@@ -1094,8 +1094,8 @@ class GLUniformMatrix4fv : protected GLUniform
10941094 {
10951095 ShaderProgramDescriptor *p = _shader->GetProgram ();
10961096
1097- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
1098- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
1097+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
1098+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
10991099 memcpy ( currentValue.data (), m, numMatrices * sizeof ( matrix_t ) );
11001100 return ;
11011101 }
@@ -1127,8 +1127,8 @@ class GLUniformMatrix34fv : protected GLUniform
11271127 {
11281128 ShaderProgramDescriptor *p = _shader->GetProgram ();
11291129
1130- if ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH
1131- || glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
1130+ if ( ( _shader->UseMaterialSystem () && _updateType == MATERIAL_OR_PUSH )
1131+ || ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) ) {
11321132 memcpy ( currentValue.data (), m, numMatrices * sizeof ( matrix_t ) );
11331133 return ;
11341134 }
0 commit comments