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

Clean-up and re-org of the main GLSL object types.

Browse Source 
Use the gl_shader struct as it should be.
Renamed gl_linked_program to gl_shader_program.
Store both shaders and programs in the same hash table and use the Type field
to distinguish them.
This commit is contained in:
Brian
2006-12-19 18:46:56 -07:00
parent 0bf5dbe002
commit 65a18442e5
9 changed files with 288 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/main/state.c
View File

@@ -949,8 +949,7 @@ update_arrays( GLcontext *ctx )
static void
update_program(GLcontext *ctx)
{
const struct gl_linked_program *linked = ctx->Shader.CurrentProgram;
const struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
/* These _Enabled flags indicate if the program is enabled AND valid. */
ctx->VertexProgram._Enabled = ctx->VertexProgram.Enabled
@@ -973,10 +972,10 @@ update_program(GLcontext *ctx)
ctx->FragmentProgram._Current = NULL;
if (linked && linked->LinkStatus) {
if (shProg && shProg->LinkStatus) {
/* Use shader programs */
ctx->VertexProgram._Current = linked->VertexProgram;
ctx->FragmentProgram._Current = linked->FragmentProgram;
ctx->VertexProgram._Current = shProg->VertexProgram;
ctx->FragmentProgram._Current = shProg->FragmentProgram;
}
else {
if (ctx->VertexProgram._Enabled) {