fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Store gl_uniform_driver_storage::format as the actual type

Browse source 
And delete the incorrect comment.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Ian Romanick 2014-06-10 10:41:32 -07:00
parent 0d89448662
commit 014d45f137
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/glsl/ir_uniform.h
View file

@ -37,7 +37,7 @@
extern "C" {
#endif
enum gl_uniform_driver_format {
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. */
@ -66,11 +66,8 @@ struct gl_uniform_driver_storage {
/**
* Base format of the stored data.
*
* This field must have a value from \c GLSL_TYPE_UINT through \c
* GLSL_TYPE_SAMPLER.
*/
uint8_t format;
enum gl_uniform_driver_format format;
/**
* Pointer to the base of the data.

2
src/mesa/main/uniforms.c
View file

@ -112,7 +112,7 @@ _mesa_uniform_attach_driver_storage(struct gl_uniform_storage *uni,
uni->driver_storage[uni->num_driver_storage].element_stride = element_stride;
uni->driver_storage[uni->num_driver_storage].vector_stride = vector_stride;
uni->driver_storage[uni->num_driver_storage].format = (uint8_t) format;
uni->driver_storage[uni->num_driver_storage].format = format;
uni->driver_storage[uni->num_driver_storage].data = data;
uni->num_driver_storage++;