Browse Source

removed a fairly pointless constant for the time being

jp9000 12 years ago
parent
commit
806bf557e5

+ 0 - 3
libobs-d3d11/GS_D3D11Shader.cpp

@@ -110,9 +110,6 @@ void gs_shader::BuildConstantBuffer()
 		case SHADER_PARAM_VEC2:  constantSize += sizeof(vec2); break;
 		case SHADER_PARAM_VEC3:  constantSize += sizeof(float)*3; break;
 		case SHADER_PARAM_VEC4:  constantSize += sizeof(vec4); break;
-		case SHADER_PARAM_MATRIX3X3:
-			constantSize += sizeof(float)*3*3;
-			break;
 		case SHADER_PARAM_MATRIX4X4:
 			constantSize += sizeof(float)*4*4;
 		}

+ 0 - 1
libobs-opengl/gl-shader.c

@@ -354,7 +354,6 @@ void shader_setval(shader_t shader, sparam_t param, const void *val,
 	case SHADER_PARAM_VEC2:      expected_size = sizeof(float)*2; break;
 	case SHADER_PARAM_VEC3:      expected_size = sizeof(float)*3; break;
 	case SHADER_PARAM_VEC4:      expected_size = sizeof(float)*4; break;
-	case SHADER_PARAM_MATRIX3X3: expected_size = sizeof(float)*3*3; break;
 	case SHADER_PARAM_MATRIX4X4: expected_size = sizeof(float)*4*4; break;
 	}
 

+ 0 - 3
libobs/graphics/effect-parser.c

@@ -1288,8 +1288,6 @@ static void ep_compile_param(struct effect_parser *ep, size_t idx)
 		param->type = SHADER_PARAM_VEC3;
 	else if (strcmp(param_in->type, "float4") == 0)
 		param->type = SHADER_PARAM_VEC4;
-	else if (strcmp(param_in->type, "float3x3") == 0)
-		param->type = SHADER_PARAM_MATRIX3X3;
 	else if (strcmp(param_in->type, "float4x4") == 0)
 		param->type = SHADER_PARAM_MATRIX4X4;
 	else if (param_in->is_texture)
@@ -1312,7 +1310,6 @@ static inline void ep_compile_pass_shaderparams(struct effect_parser *ep,
 	for (i = 0; i < pass_params->num; i++) {
 		struct dstr *param_name;
 		struct pass_shaderparam *param;
-		int test;
 
 		param_name = darray_item(sizeof(struct dstr), used_params, i);
 		param = darray_item(sizeof(struct pass_shaderparam),

+ 0 - 1
libobs/graphics/graphics.h

@@ -274,7 +274,6 @@ enum shader_param_type {
 	SHADER_PARAM_VEC2,
 	SHADER_PARAM_VEC3,
 	SHADER_PARAM_VEC4,
-	SHADER_PARAM_MATRIX3X3,
 	SHADER_PARAM_MATRIX4X4,
 	SHADER_PARAM_TEXTURE,
 };

+ 0 - 2
libobs/graphics/shader-parser.c

@@ -29,8 +29,6 @@ enum shader_param_type get_shader_param_type(const char *type)
 		return SHADER_PARAM_VEC4;
 	else if (astrcmp_n(type, "texture", 7) == 0)
 		return SHADER_PARAM_TEXTURE;
-	else if (strcmp(type, "float3x3") == 0)
-		return SHADER_PARAM_MATRIX3X3;
 	else if (strcmp(type, "float4x4") == 0)
 		return SHADER_PARAM_MATRIX4X4;
 	else if (strcmp(type, "bool") == 0)