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

glsl: Remove GLSL_TYPE_FUNCTION define.

Browse source 
Functions are not first class objects in GLSL, so there is never a value
of function type.  No code actually used this except for one function
which asserted it shouldn't occur.  One comment mentioned it, but was
incorrect.  So we may as well remove it entirely.
This commit is contained in:
Kenneth Graunke 2010-11-10 23:14:45 -08:00
parent 62fe9c4efc
commit ee36f14fa5
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/glsl/glsl_types.h
View file

@ -50,9 +50,8 @@ _mesa_glsl_release_types(void);
#define GLSL_TYPE_SAMPLER 4
#define GLSL_TYPE_STRUCT 5
#define GLSL_TYPE_ARRAY 6
#define GLSL_TYPE_FUNCTION 7
#define GLSL_TYPE_VOID 8
#define GLSL_TYPE_ERROR 9
#define GLSL_TYPE_VOID 7
#define GLSL_TYPE_ERROR 8
enum glsl_sampler_dim {
GLSL_SAMPLER_DIM_1D = 0,
@ -123,11 +122,6 @@ struct glsl_type {
* For \c GLSL_TYPE_ARRAY, this is the length of the array. For
* \c GLSL_TYPE_STRUCT, it is the number of elements in the structure and
* the number of values pointed to by \c fields.structure (below).
*
* For \c GLSL_TYPE_FUNCTION, it is the number of parameters to the
* function. The return value from a function is implicitly the first
* parameter. The types of the parameters are stored in
* \c fields.parameters (below).
*/
unsigned length;

1
src/glsl/ir_function.cpp
View file

@ -70,7 +70,6 @@ type_compare(const glsl_type *a, const glsl_type *b)
*/
return (type_compare(a->fields.array, b->fields.array) == 0) ? 0 : -1;
case GLSL_TYPE_FUNCTION:
case GLSL_TYPE_VOID:
case GLSL_TYPE_ERROR:
default: