Merge remote branch 'origin/master' into radeon-rewrite

[mesa.git] / src / mesa / drivers / dri / r300 / r300_state.h

diff --git a/src/mesa/drivers/dri/r300/r300_state.h b/src/mesa/drivers/dri/r300/r300_state.h
index 365f7ecd0c62bc05bd4ffd1c4e11eb456428f17b..247a20ee5164b4cff237b2248cb83094449af6e4 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.h
+++ b/src/mesa/drivers/dri/r300/r300_state.h
@@ -39,39 +39,27 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define R300_NEWPRIM( rmesa )                  \
   do {                                         \
-    if ( rmesa->dma.flush )                    \
-      rmesa->dma.flush( rmesa );               \
+  if ( rmesa->radeon.dma.flush )                       \
+    rmesa->radeon.dma.flush( rmesa->radeon.glCtx );    \
   } while (0)
 
 #define R300_STATECHANGE(r300, atom) \
        do {                                            \
          R300_NEWPRIM(r300);                           \
                r300->hw.atom.dirty = GL_TRUE;          \
-               r300->hw.is_dirty = GL_TRUE;            \
+               r300->radeon.hw.is_dirty = GL_TRUE;             \
        } while(0)
 
-#define R300_PRINT_STATE(r300, atom) \
-               r300PrintStateAtom(r300, &r300->hw.atom)
-
-/* Fire the buffered vertices no matter what.
-   TODO: This has not been implemented yet
- */
-#define R300_FIREVERTICES( r300 )                      \
-do {                                                   \
-    \
-   if ( (r300)->cmdbuf.count_used || (r300)->dma.flush ) {     \
-      r300Flush( (r300)->radeon.glCtx );               \
-   }                                                   \
-    \
-} while (0)
-
-extern void r300UpdateStateParameters(GLcontext * ctx, GLuint new_state);
-extern void r300InitState(r300ContextPtr r300);
-extern void r300InitStateFuncs(struct dd_function_table *functions);
-extern void r300UpdateViewportOffset(GLcontext * ctx);
-extern void r300UpdateDrawBuffer(GLcontext * ctx);
-
-extern void r300UpdateShaders(r300ContextPtr rmesa);
-extern void r300UpdateShaderStates(r300ContextPtr rmesa);
+// r300_state.c
+extern int future_hw_tcl_on;
+void _tnl_UpdateFixedFunctionProgram (GLcontext * ctx);
+void r300UpdateViewportOffset (GLcontext * ctx);
+void r300UpdateDrawBuffer (GLcontext * ctx);
+void r300UpdateStateParameters (GLcontext * ctx, GLuint new_state);
+void r300UpdateShaders (r300ContextPtr rmesa);
+void r300UpdateShaderStates (r300ContextPtr rmesa);
+void r300InitState (r300ContextPtr r300);
+void r300UpdateClipPlanes (GLcontext * ctx);
+void r300InitStateFuncs (struct dd_function_table *functions);
 
 #endif                         /* __R300_STATE_H__ */