r300: rename functions

Be consistent with function naming: use Setup/Emit names for functions that modify hardware state

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index d9e1944d716ea5dbe0f08f2dd1ed745df8c8e342..cd25b1da017a559c8750ce6d8e7f116f21413f94 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -616,7 +616,7 @@ struct r300_swtcl_info {
 struct r300_vtable {
        void (* SetupRSUnit)(GLcontext *ctx);
        void (* SetupFragmentShaderTextures)(GLcontext *ctx, int *tmu_mappings);
-       GLboolean (* FragmentProgramEmit)(struct r300_fragment_program_compiler *compiler);
+       GLboolean (* BuildFragmentProgramHwCode)(struct r300_fragment_program_compiler *compiler);
        void (* FragmentProgramDump)(union rX00_fragment_program_code *code);
        GLboolean (* SetupPixelShader)(GLcontext *ctx);
 };

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.h b/src/mesa/drivers/dri/r300/r300_fragprog.h
index affa022a5cf147bbdfb3cc0650e5be2b6941f1e3..5ce6f33cee705197f43d716f8f39b65801304048 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog.h
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.h
@@ -102,7 +102,7 @@
 
 #endif
 
-extern GLboolean r300FragmentProgramEmit(struct r300_fragment_program_compiler *compiler);
+extern GLboolean r300BuildFragmentProgramHwCode(struct r300_fragment_program_compiler *compiler);
 
 extern void r300FragmentProgramDump(union rX00_fragment_program_code *c);
 

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
index 2a880e6d144010e64488e9d94b3944fb1637fb07..abc8757ba1fe8a4904ba5b3c88b49bcb0e47bde1 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@ -269,7 +269,7 @@ void r300TranslateFragmentShader(GLcontext *ctx, struct gl_fragment_program *fp)
                        fflush(stdout);
                }
 
-               if (!r300->vtbl.FragmentProgramEmit(&compiler))
+               if (!r300->vtbl.BuildFragmentProgramHwCode(&compiler))
                        r300_fp->error = GL_TRUE;
 
                /* Subtle: Rescue any parameters that have been added during transformations */

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_emit.c b/src/mesa/drivers/dri/r300/r300_fragprog_emit.c
index af8bb3887bccb452884b831fd71bcfad0dfd91a8..b75656e7ee1bb0a36b15f047db98f8c200566c77 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_emit.c
@@ -325,7 +325,7 @@ static const struct radeon_pair_handler pair_handler = {
  * Final compilation step: Turn the intermediate radeon_program into
  * machine-readable instructions.
  */
-GLboolean r300FragmentProgramEmit(struct r300_fragment_program_compiler *compiler)
+GLboolean r300BuildFragmentProgramHwCode(struct r300_fragment_program_compiler *compiler)
 {
        struct r300_fragment_program_code *code = &compiler->code->r300;
 

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 397a26c3dfe714923c160df2c2eeabc42cb91625..7b523e532f4c352c367948d4733e1f2d4f3cc0aa 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -2551,13 +2551,13 @@ void r300InitShaderFunctions(r300ContextPtr r300)
                r300->vtbl.SetupRSUnit = r500SetupRSUnit;
                r300->vtbl.SetupPixelShader = r500SetupPixelShader;
                r300->vtbl.SetupFragmentShaderTextures = r500SetupFragmentShaderTextures;
-               r300->vtbl.FragmentProgramEmit = r500FragmentProgramEmit;
+               r300->vtbl.BuildFragmentProgramHwCode = r500BuildFragmentProgramHwCode;
                r300->vtbl.FragmentProgramDump = r500FragmentProgramDump;
        } else {
                r300->vtbl.SetupRSUnit = r300SetupRSUnit;
                r300->vtbl.SetupPixelShader = r300SetupPixelShader;
                r300->vtbl.SetupFragmentShaderTextures = r300SetupFragmentShaderTextures;
-               r300->vtbl.FragmentProgramEmit = r300FragmentProgramEmit;
+               r300->vtbl.BuildFragmentProgramHwCode = r300BuildFragmentProgramHwCode;
                r300->vtbl.FragmentProgramDump = r300FragmentProgramDump;
        }
 }

diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.h b/src/mesa/drivers/dri/r300/r500_fragprog.h
index 9ca2f9be5108720bdbae8805fa898b5a279fef2b..1179bf660738443f2e8f076eda9cba6acc6009e2 100644 (file)
--- a/src/mesa/drivers/dri/r300/r500_fragprog.h
+++ b/src/mesa/drivers/dri/r300/r500_fragprog.h
@@ -39,7 +39,7 @@
 #include "r300_context.h"
 #include "radeon_nqssadce.h"
 
-extern GLboolean r500FragmentProgramEmit(struct r300_fragment_program_compiler *compiler);
+extern GLboolean r500BuildFragmentProgramHwCode(struct r300_fragment_program_compiler *compiler);
 
 extern void r500FragmentProgramDump(union rX00_fragment_program_code *c);
 

diff --git a/src/mesa/drivers/dri/r300/r500_fragprog_emit.c b/src/mesa/drivers/dri/r300/r500_fragprog_emit.c
index 277f801c38536f6d16fc52ba3ea2eb7e10814cd1..30f4514897eaece9df2a2bdb5080f1544d6135bd 100644 (file)
--- a/src/mesa/drivers/dri/r300/r500_fragprog_emit.c
+++ b/src/mesa/drivers/dri/r300/r500_fragprog_emit.c
@@ -299,7 +299,7 @@ static const struct radeon_pair_handler pair_handler = {
        .MaxHwTemps = 128
 };
 
-GLboolean r500FragmentProgramEmit(struct r300_fragment_program_compiler *compiler)
+GLboolean r500BuildFragmentProgramHwCode(struct r300_fragment_program_compiler *compiler)
 {
        struct r500_fragment_program_code *code = &compiler->code->r500;