Skip to content

Commit 12089df

Browse files
committed
NUKE unused GLUniform.GetSize()
1 parent 7d59d7c commit 12089df

File tree

1 file changed

+0
-51
lines changed

1 file changed

+0
-51
lines changed

src/engine/renderer/gl_shader.h

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,6 @@ class GLUniform {
434434
void UpdateShaderProgramUniformLocation( ShaderProgramDescriptor* shaderProgram ) {
435435
shaderProgram->uniformLocations[_locationIndex] = glGetUniformLocation( shaderProgram->id, _name.c_str() );
436436
}
437-
438-
virtual size_t GetSize() {
439-
return 0;
440-
}
441437
};
442438

443439
class GLShaderManager {
@@ -587,10 +583,6 @@ class GLUniformSampler : protected GLUniform {
587583
}
588584

589585
public:
590-
size_t GetSize() override {
591-
return sizeof( GLuint64 );
592-
}
593-
594586
void SetValue( GLuint value ) {
595587
if ( !CacheValue( &value ) ) {
596588
return;
@@ -654,11 +646,6 @@ class GLUniform1i : protected GLUniform
654646
ShaderProgramDescriptor* p = _shader->GetProgram();
655647
glUniform1i( p->uniformLocations[ _locationIndex ], value );
656648
}
657-
public:
658-
size_t GetSize() override
659-
{
660-
return sizeof( int );
661-
}
662649
};
663650

664651
class GLUniform1ui : protected GLUniform {
@@ -675,10 +662,6 @@ class GLUniform1ui : protected GLUniform {
675662
ShaderProgramDescriptor* p = _shader->GetProgram();
676663
glUniform1ui( p->uniformLocations[_locationIndex], value );
677664
}
678-
public:
679-
size_t GetSize() override {
680-
return sizeof( uint );
681-
}
682665
};
683666

684667
class GLUniform1Bool : protected GLUniform {
@@ -696,11 +679,6 @@ class GLUniform1Bool : protected GLUniform {
696679
ShaderProgramDescriptor* p = _shader->GetProgram();
697680
glUniform1i( p->uniformLocations[_locationIndex], value );
698681
}
699-
700-
public:
701-
size_t GetSize() override {
702-
return sizeof( int );
703-
}
704682
};
705683

706684
class GLUniform1f : protected GLUniform
@@ -719,11 +697,6 @@ class GLUniform1f : protected GLUniform
719697
ShaderProgramDescriptor* p = _shader->GetProgram();
720698
glUniform1f( p->uniformLocations[ _locationIndex ], value );
721699
}
722-
public:
723-
size_t GetSize() override
724-
{
725-
return sizeof( float );
726-
}
727700
};
728701

729702
class GLUniform1fv : protected GLUniform
@@ -760,11 +733,6 @@ class GLUniform2f : protected GLUniform
760733
ShaderProgramDescriptor* p = _shader->GetProgram();
761734
glUniform2f( p->uniformLocations[ _locationIndex ], v[ 0 ], v[ 1 ] );
762735
}
763-
764-
size_t GetSize() override
765-
{
766-
return sizeof( vec2_t );
767-
}
768736
};
769737

770738
class GLUniform3f : protected GLUniform
@@ -783,11 +751,6 @@ class GLUniform3f : protected GLUniform
783751
ShaderProgramDescriptor* p = _shader->GetProgram();
784752
glUniform3f( p->uniformLocations[ _locationIndex ], v[ 0 ], v[ 1 ], v[ 2 ] );
785753
}
786-
public:
787-
size_t GetSize() override
788-
{
789-
return sizeof( vec3_t );
790-
}
791754
};
792755

793756
class GLUniform4f : protected GLUniform
@@ -806,11 +769,6 @@ class GLUniform4f : protected GLUniform
806769
ShaderProgramDescriptor* p = _shader->GetProgram();
807770
glUniform4f( p->uniformLocations[ _locationIndex ], v[ 0 ], v[ 1 ], v[ 2 ], v[ 3 ] );
808771
}
809-
public:
810-
size_t GetSize() override
811-
{
812-
return sizeof( vec4_t );
813-
}
814772
};
815773

816774
class GLUniform4fv : protected GLUniform
@@ -847,11 +805,6 @@ class GLUniformMatrix4f : protected GLUniform
847805
ShaderProgramDescriptor* p = _shader->GetProgram();
848806
glUniformMatrix4fv( p->uniformLocations[ _locationIndex ], 1, transpose, m );
849807
}
850-
public:
851-
size_t GetSize() override
852-
{
853-
return sizeof( matrix_t );
854-
}
855808
};
856809

857810
class GLUniformMatrix32f : protected GLUniform {
@@ -871,10 +824,6 @@ class GLUniformMatrix32f : protected GLUniform {
871824
ShaderProgramDescriptor* p = _shader->GetProgram();
872825
glUniformMatrix3x2fv( p->uniformLocations[_locationIndex], 1, transpose, m );
873826
}
874-
public:
875-
size_t GetSize() override {
876-
return 6 * sizeof( float );
877-
}
878827
};
879828

880829
class GLUniformMatrix4fv : protected GLUniform

0 commit comments

Comments
 (0)