summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/state.c
diff options
context:
space:
mode:
authorBrian <[email protected]>2006-12-19 18:02:41 -0700
committerBrian <[email protected]>2006-12-19 18:02:41 -0700
commit0bf5dbe002a64e198f55724cc1542602c012490f (patch)
tree06ef50fd181c0985562797197db244fadea893c5 /src/mesa/main/state.c
parent5b01c5e9d2c0283cc31981b6c85dc6392144b3db (diff)
Overhaul of GLSL API functions, dispatching, etc.
Diffstat (limited to 'src/mesa/main/state.c')
-rw-r--r--src/mesa/main/state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index e121f59258c..1d8666888ef 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -93,7 +93,7 @@
#include "texenvprogram.h"
#endif
#if FEATURE_ARB_shader_objects
-#include "shaderobjects.h"
+#include "shaders.h"
#endif
#include "debug.h"
#include "dispatch.h"
@@ -949,7 +949,7 @@ update_arrays( GLcontext *ctx )
static void
update_program(GLcontext *ctx)
{
- const struct gl_linked_program *linked = ctx->ShaderObjects.Linked;
+ const struct gl_linked_program *linked = ctx->Shader.CurrentProgram;
/* These _Enabled flags indicate if the program is enabled AND valid. */