X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Funiforms.h;h=0a9ee7de92ca6bfba1875b4a1a241896b05f4d24;hb=de42431a9d761305c9911f30b5880a9a049a2d60;hp=d7afdc1068877bd8d0f5b889b580026809b11e13;hpb=d96ed5c088157f36661e4dbe37b5058cc6790052;p=mesa.git

diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
index d7afdc10688..0a9ee7de92c 100644
--- a/src/mesa/main/uniforms.h
+++ b/src/mesa/main/uniforms.h
@@ -259,13 +259,15 @@ _mesa_parse_program_resource_name(const GLchar *name,
                                   const GLchar **out_base_name_end);
 
 unsigned
-_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,
+_mesa_get_uniform_location(struct gl_shader_program *shProg,
 			   const GLchar *name, unsigned *offset);
 
 void
 _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shader_program,
 	      GLint location, GLsizei count,
-              const GLvoid *values, GLenum type);
+              const GLvoid *values,
+              enum glsl_base_type basicType,
+              unsigned src_components);
 
 void
 _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
@@ -300,6 +302,8 @@ _mesa_update_shader_textures_used(struct gl_shader_program *shProg,
 extern bool
 _mesa_sampler_uniforms_are_valid(const struct gl_shader_program *shProg,
 				 char *errMsg, size_t errMsgLength);
+extern bool
+_mesa_sampler_uniforms_pipeline_are_valid(struct gl_pipeline_object *);
 
 extern const struct gl_program_parameter *
 get_uniform_parameter(struct gl_shader_program *shProg, GLint index);
@@ -317,73 +321,10 @@ struct gl_builtin_uniform_element {
 
 struct gl_builtin_uniform_desc {
    const char *name;
-   struct gl_builtin_uniform_element *elements;
+   const struct gl_builtin_uniform_element *elements;
    unsigned int num_elements;
 };
 
-/**
- * \name GLSL uniform arrays and structs require special handling.
- *
- * The GL_ARB_shader_objects spec says that if you use
- * glGetUniformLocation to get the location of an array, you CANNOT
- * access other elements of the array by adding an offset to the
- * returned location.  For example, you must call
- * glGetUniformLocation("foo[16]") if you want to set the 16th element
- * of the array with glUniform().
- *
- * HOWEVER, some other OpenGL drivers allow accessing array elements
- * by adding an offset to the returned array location.  And some apps
- * seem to depend on that behaviour.
- *
- * Mesa's gl_uniform_list doesn't directly support this since each
- * entry in the list describes one uniform variable, not one uniform
- * element.  We could insert dummy entries in the list for each array
- * element after [0] but that causes complications elsewhere.
- *
- * We solve this problem by creating multiple entries for uniform arrays
- * in the UniformRemapTable so that their elements get sequential locations.
- *
- * Utility functions below offer functionality to split UniformRemapTable
- * location in to location of the uniform in UniformStorage + offset to the
- * array element (0 if not an array) and also merge it back again as the
- * UniformRemapTable location.
- *
- */
-/*@{*/
-/**
- * Combine the uniform's storage index and the array index
- */
-static inline GLint
-_mesa_uniform_merge_location_offset(const struct gl_shader_program *prog,
-                                    unsigned storage_index,
-                                    unsigned uniform_array_index)
-{
-   /* location in remap table + array element offset */
-   return prog->UniformStorage[storage_index].remap_location +
-      uniform_array_index;
-}
-
-/**
- * Separate the uniform storage index and array index
- */
-static inline void
-_mesa_uniform_split_location_offset(const struct gl_shader_program *prog,
-                                    GLint location, unsigned *storage_index,
-				    unsigned *uniform_array_index)
-{
-   *storage_index = prog->UniformRemapTable[location] - prog->UniformStorage;
-   *uniform_array_index = location -
-      prog->UniformRemapTable[location]->remap_location;
-
-   /*gl_uniform_storage in UniformStorage with the calculated base_location
-    * must match with the entry in remap table
-    */
-   assert(&prog->UniformStorage[*storage_index] ==
-          prog->UniformRemapTable[location]);
-}
-/*@}*/
-
-
 #ifdef __cplusplus
 }
 #endif