Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / drivers / dri / r600 / r600_emit.h

diff --git a/src/mesa/drivers/dri/r600/r600_emit.h b/src/mesa/drivers/dri/r600/r600_emit.h
index 11765c868c34c75015aa37d653923e24beba8baa..c50b6060ca9113daee3f392ef55825b104f19da3 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_emit.h
+++ b/src/mesa/drivers/dri/r600/r600_emit.h
@@ -41,24 +41,25 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r600_cmdbuf.h"
 #include "radeon_reg.h"
 
-extern GLboolean r600EmitShader(GLcontext * ctx, 
+void r600EmitCacheFlush(context_t *rmesa);
+
+extern GLboolean r600EmitShader(struct gl_context * ctx, 
                                 void ** shaderbo,
                                            GLvoid * data, 
-                                int sizeinDWORD); 
+                                int sizeinDWORD,
+                                char * szShaderUsage); 
 
-extern GLboolean r600DeleteShader(GLcontext * ctx, 
+extern GLboolean r600DeleteShader(struct gl_context * ctx, 
                                  void * shaderbo);
 
-extern GLboolean r600EmitVec(GLcontext * ctx, 
-                             struct radeon_aos *aos,
-                                        GLvoid * data, 
-                             int size, 
-                             int stride, 
-                             int count);
-
-extern void      r600ReleaseVec(GLcontext * ctx);
-
-extern void r600FreeDmaRegion(context_t *context, 
-                              void * shaderbo);
+extern GLboolean r600AllocShaderConsts(struct gl_context * ctx,
+                                void ** constbo,                        
+                                int sizeinBYTE,
+                                char * szShaderUsage);
+GLboolean r600EmitShaderConsts(struct gl_context * ctx,
+                               void * constbo,
+                               int    bo_offset,
+                               GLvoid * data,
+                               int sizeinBYTE);
 
 #endif