Merge branch 'llvm-cliptest-viewport'

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

diff --git a/src/mesa/drivers/dri/r600/r700_fragprog.h b/src/mesa/drivers/dri/r600/r700_fragprog.h
index 9c7813e90845a22d31874acca6584d94be304fcd..bdb95ff0e7178468ccafe796602ad1f9ea918a63 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_fragprog.h
+++ b/src/mesa/drivers/dri/r600/r700_fragprog.h
@@ -43,21 +43,33 @@ struct r700_fragment_program
 
     void * shaderbo;
 
+       GLuint k0used;
+    void * constbo0;
+
        GLboolean WritesDepth;
        GLuint optimization;
 };
 
 /* Internal */
+void insert_wpos_code(struct gl_context *ctx, struct gl_fragment_program *fprog);
+
 void Map_Fragment_Program(r700_AssemblerBase         *pAsm,
-                                                 struct gl_fragment_program *mesa_fp);
+                         struct gl_fragment_program *mesa_fp,
+                          struct gl_context *ctx); 
 GLboolean Find_Instruction_Dependencies_fp(struct r700_fragment_program *fp,
-                                                                  struct gl_fragment_program   *mesa_fp);
+                                          struct gl_fragment_program   *mesa_fp);
+
+GLboolean r700TranslateFragmentShader(struct r700_fragment_program *fp,
+                                     struct gl_fragment_program   *mesa_vp,
+                                      struct gl_context *ctx); 
 
 /* Interface */
-extern GLboolean r700TranslateFragmentShader(struct r700_fragment_program *fp,
-                                                                        struct gl_fragment_program   *mesa_vp);
-extern GLboolean r700SetupFragmentProgram(GLcontext * ctx);
+extern void r700SelectFragmentShader(struct gl_context *ctx);
+
+extern GLboolean r700SetupFragmentProgram(struct gl_context * ctx);
+
+extern void *    r700GetActiveFpShaderBo(struct gl_context * ctx);
 
-extern void *    r700GetActiveFpShaderBo(GLcontext * ctx);
+extern void *    r700GetActiveFpShaderConstBo(struct gl_context * ctx);
 
 #endif /*_R700_FRAGPROG_H_*/