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

mesa: reorder gl_program, gl_shader, gl_shader_program 

gl_program : 1344->1336
gl_shader: 488->472
gl_shader_program: 352->344.

Acked-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Alex Deucher alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2015-03-20 16:54:40 +10:00
parent 7b634fed59
commit 0ff4726a06
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesa/main/mtypes.h
View File

@ -2232,8 +2232,9 @@ enum gl_frag_depth_layout
struct gl_program
{
GLuint Id;
GLubyte *String; /**< Null-terminated program text */
GLint RefCount;
GLubyte *String; /**< Null-terminated program text */
GLenum Target; /**< GL_VERTEX/FRAGMENT_PROGRAM_ARB, GL_GEOMETRY_PROGRAM_NV */
GLenum Format; /**< String encoding format */
@ -2536,18 +2537,20 @@ struct gl_shader
GLenum Type;
gl_shader_stage Stage;
GLuint Name; /**< AKA the handle */
GLchar *Label; /**< GL_KHR_debug */
GLint RefCount; /**< Reference count */
GLchar *Label; /**< GL_KHR_debug */
GLboolean DeletePending;
GLboolean CompileStatus;
const GLchar *Source; /**< Source code string */
GLboolean IsES; /**< True if this shader uses GLSL ES */
GLuint SourceChecksum; /**< for debug/logging purposes */
const GLchar *Source; /**< Source code string */
struct gl_program *Program; /**< Post-compile assembly code */
GLchar *InfoLog;
struct gl_sl_pragmas Pragmas;
unsigned Version; /**< GLSL version used for linking */
GLboolean IsES; /**< True if this shader uses GLSL ES */
/**
* \name Sampler tracking
@ -2591,8 +2594,8 @@ struct gl_shader
*
* These fields are only set post-linking.
*/
struct gl_uniform_block *UniformBlocks;
unsigned NumUniformBlocks;
struct gl_uniform_block *UniformBlocks;
struct exec_list *ir;
struct glsl_symbol_table *symbols;
@ -2882,8 +2885,8 @@ struct gl_shader_program
*/
unsigned LastClipDistanceArraySize;
struct gl_uniform_block *UniformBlocks;
unsigned NumUniformBlocks;
struct gl_uniform_block *UniformBlocks;
/**
* Indices into the _LinkedShaders's UniformBlocks[] array for each stage