OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl2: Move our data from a glsl_shader* on the side to the main gl_shader *.

Browse Source 
This saves recompiling at link time.  gl_shader->ir is made a pointer
so that we don't have to bring exec_list into mtypes.h.
This commit is contained in:
Eric Anholt
2010-06-30 11:05:43 -07:00
parent 524745bc55
commit 16b68b1952
7 changed files with 96 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/glsl/program.h
View File

@@ -29,24 +29,6 @@ extern "C" {
#include "shader/prog_uniform.h"
}
/**
* Based on gl_shader in Mesa's mtypes.h.
*/
struct glsl_shader {
GLenum Type;
GLuint Name;
GLint RefCount;
GLboolean DeletePending;
GLboolean CompileStatus;
const GLchar *Source; /**< Source code string */
size_t SourceLen;
GLchar *InfoLog;
struct exec_list ir;
struct glsl_symbol_table *symbols;
struct gl_shader *mesa_shader;
};
/**
* Based on gl_shader_program in Mesa's mtypes.h.
*/
@@ -57,14 +39,14 @@ struct glsl_program {
GLboolean DeletePending;
GLuint NumShaders; /**< number of attached shaders */
struct glsl_shader **Shaders; /**< List of attached the shaders */
struct gl_shader **Shaders; /**< List of attached the shaders */
/**
* Per-stage shaders resulting from the first stage of linking.
*/
/*@{*/
unsigned _NumLinkedShaders;
struct glsl_shader **_LinkedShaders;
struct gl_shader **_LinkedShaders;
/*@}*/
/** User-defined attribute bindings (glBindAttribLocation) */