KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: Delete unused gl_uniform_driver_format enum values. 

A while back, Matt made the uniform upload functions simply upload
ctx->Const.UniformBooleanTrue for boolean values instead of 0/1, which
removed the need to convert it later.  We also set UniformBooleanTrue to
1.0f for drivers which want to treat booleans as 0.0/1.0f.

Nothing ever sets these, so they are dead.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Kenneth Graunke 2014-10-16 09:28:42 -07:00
parent 36310d9d56
commit 32364a1fe5
2 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/glsl/ir_uniform.h
View File

@ -45,17 +45,6 @@ extern "C" {
enum PACKED gl_uniform_driver_format {
uniform_native = 0, /**< Store data in the native format. */
uniform_int_float, /**< Store integer data as floats. */
uniform_bool_float, /**< Store boolean data as floats. */
/**
* Store boolean data as integer using 1 for \c true.
*/
uniform_bool_int_0_1,
/**
* Store boolean data as integer using ~0 for \c true.
*/
uniform_bool_int_0_not0
};
struct gl_uniform_driver_storage {

27
src/mesa/main/uniform_query.cpp
View File

@ -533,8 +533,7 @@ _mesa_propagate_uniforms_to_driver_storage(struct gl_uniform_storage *uni,
dst += array_index * store->element_stride;
switch (store->format) {
case uniform_native:
case uniform_bool_int_0_1: {
case uniform_native: {
unsigned j;
unsigned v;
@ -550,8 +549,7 @@ _mesa_propagate_uniforms_to_driver_storage(struct gl_uniform_storage *uni,
break;
}
case uniform_int_float:
case uniform_bool_float: {
case uniform_int_float: {
const int *isrc = (const int *) src;
unsigned j;
unsigned v;
@ -572,27 +570,6 @@ _mesa_propagate_uniforms_to_driver_storage(struct gl_uniform_storage *uni,
break;
}
case uniform_bool_int_0_not0: {
const int *isrc = (const int *) src;
unsigned j;
unsigned v;
unsigned c;
for (j = 0; j < count; j++) {
for (v = 0; v < vectors; v++) {
for (c = 0; c < components; c++) {
((int *) dst)[c] = *isrc == 0 ? 0 : ~0;
isrc++;
}
dst += store->vector_stride;
}
dst += extra_stride;
}
break;
}
default:
assert(!"Should not get here.");
break;