Merge branch 'primitive-restart-cleanup'

[mesa.git] / src / mesa / state_tracker / st_atom_viewport.c

diff --git a/src/mesa/state_tracker/st_atom_viewport.c b/src/mesa/state_tracker/st_atom_viewport.c
index b82bbfe410fe36e622415edbb4d53dcdc81d0157..d10f1840df6ac3db0210a04d7fc07a2ee8f3c627 100644 (file)
--- a/src/mesa/state_tracker/st_atom_viewport.c
+++ b/src/mesa/state_tracker/st_atom_viewport.c
@@ -27,7 +27,6 @@
 
 
 #include "main/context.h"
-#include "main/colormac.h"
 #include "st_context.h"
 #include "st_atom.h"
 #include "pipe/p_context.h"
@@ -42,7 +41,7 @@
 static void
 update_viewport( struct st_context *st )
 {
-   GLcontext *ctx = st->ctx;
+   struct gl_context *ctx = st->ctx;
    GLfloat yScale, yBias;
 
    /* _NEW_BUFFERS