projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: refactor: move glReadPixels code into new readpix.c file
[mesa.git]
/
src
/
mesa
/
main
/
mtypes.h
diff --git
a/src/mesa/main/mtypes.h
b/src/mesa/main/mtypes.h
index 44587ae96222fc187a1ac61de1eee6e4bb401adb..463142fe3953476cd19ae9d80cd703195bca06fc 100644
(file)
--- a/
src/mesa/main/mtypes.h
+++ b/
src/mesa/main/mtypes.h
@@
-123,6
+123,7
@@
typedef int GLfixed;
/*@{*/
struct _mesa_HashTable;
struct gl_pixelstore_attrib;
/*@{*/
struct _mesa_HashTable;
struct gl_pixelstore_attrib;
+struct gl_program_cache;
struct gl_texture_format;
struct gl_texture_image;
struct gl_texture_object;
struct gl_texture_format;
struct gl_texture_image;
struct gl_texture_object;
@@
-1556,17
+1557,6
@@
struct gl_texture_unit
/*@}*/
};
/*@}*/
};
-struct texenvprog_cache_item {
- GLuint hash;
- void *key;
- struct gl_fragment_program *data;
- struct texenvprog_cache_item *next;
-};
-
-struct texenvprog_cache {
- struct texenvprog_cache_item **items;
- GLuint size, n_items;
-};
/**
* Texture attribute group (GL_TEXTURE_BIT).
/**
* Texture attribute group (GL_TEXTURE_BIT).
@@
-1598,9
+1588,6
@@
struct gl_texture_attrib
/** GL_EXT_shared_texture_palette */
GLboolean SharedPalette;
struct gl_color_table Palette;
/** GL_EXT_shared_texture_palette */
GLboolean SharedPalette;
struct gl_color_table Palette;
-
- /** Cached texenv fragment programs */
- struct texenvprog_cache env_fp_cache;
};
};
@@
-1881,6
+1868,7
@@
enum register_file
/** Vertex and fragment instructions */
struct prog_instruction;
struct gl_program_parameter_list;
/** Vertex and fragment instructions */
struct prog_instruction;
struct gl_program_parameter_list;
+struct gl_uniform_list;
/**
/**
@@
-2000,6
+1988,9
@@
struct gl_vertex_program_state
/** Program to emulate fixed-function T&L (see above) */
struct gl_vertex_program *_TnlProgram;
/** Program to emulate fixed-function T&L (see above) */
struct gl_vertex_program *_TnlProgram;
+ /** Cache of fixed-function programs */
+ struct gl_program_cache *Cache;
+
#if FEATURE_MESA_program_debug
GLprogramcallbackMESA Callback;
GLvoid *CallbackData;
#if FEATURE_MESA_program_debug
GLprogramcallbackMESA Callback;
GLvoid *CallbackData;
@@
-2033,6
+2024,9
@@
struct gl_fragment_program_state
/** Program to emulate fixed-function texture env/combine (see above) */
struct gl_fragment_program *_TexEnvProgram;
/** Program to emulate fixed-function texture env/combine (see above) */
struct gl_fragment_program *_TexEnvProgram;
+ /** Cache of fixed-function programs */
+ struct gl_program_cache *Cache;
+
#if FEATURE_MESA_program_debug
GLprogramcallbackMESA Callback;
GLvoid *CallbackData;
#if FEATURE_MESA_program_debug
GLprogramcallbackMESA Callback;
GLvoid *CallbackData;
@@
-2111,7
+2105,7
@@
struct gl_query_state
/**
/**
- * A GLSL shader object.
+ * A GLSL
vertex or fragment
shader object.
*/
struct gl_shader
{
*/
struct gl_shader
{
@@
-2129,7
+2123,8
@@
struct gl_shader
/**
/**
- * A GLSL program object. Basically a linked collection of "shaders".
+ * A GLSL program object.
+ * Basically a linked collection of vertex and fragment shaders.
*/
struct gl_shader_program
{
*/
struct gl_shader_program
{
@@
-2144,7
+2139,7
@@
struct gl_shader_program
/* post-link info: */
struct gl_vertex_program *VertexProgram; /**< Linked vertex program */
struct gl_fragment_program *FragmentProgram; /**< Linked fragment prog */
/* post-link info: */
struct gl_vertex_program *VertexProgram; /**< Linked vertex program */
struct gl_fragment_program *FragmentProgram; /**< Linked fragment prog */
- struct gl_
program_parameter_list *Uniforms; /**< Plus constants, etc */
+ struct gl_
uniform_list *Uniforms;
struct gl_program_parameter_list *Varying;
struct gl_program_parameter_list *Attributes; /**< Vertex attributes */
GLboolean LinkStatus; /**< GL_LINK_STATUS */
struct gl_program_parameter_list *Varying;
struct gl_program_parameter_list *Attributes; /**< Vertex attributes */
GLboolean LinkStatus; /**< GL_LINK_STATUS */
@@
-2208,10
+2203,10
@@
struct gl_shared_state
/*@{*/
struct _mesa_HashTable *Programs; /**< All vertex/fragment programs */
#if FEATURE_ARB_vertex_program
/*@{*/
struct _mesa_HashTable *Programs; /**< All vertex/fragment programs */
#if FEATURE_ARB_vertex_program
- struct gl_program *DefaultVertexProgram;
+ struct gl_
vertex_
program *DefaultVertexProgram;
#endif
#if FEATURE_ARB_fragment_program
#endif
#if FEATURE_ARB_fragment_program
- struct gl_program *DefaultFragmentProgram;
+ struct gl_
fragment_
program *DefaultFragmentProgram;
#endif
/*@}*/
#endif
/*@}*/