fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

r300: more prepare for merge

Browse source
This commit is contained in:
Maciej Cencora 2009-04-18 04:00:51 +02:00 • committed by Dave Airlie
parent 97104c2559
commit 155cc1647f
6 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/r300/r300_context.h
View file

@ -616,6 +616,7 @@ struct r300_vtable {
void (* SetupFragmentShaderTextures)(GLcontext *ctx, int *tmu_mappings);
void (* TranslateFragmentShader)(GLcontext *ctx, struct gl_fragment_program *fp);
GLboolean (* FragmentProgramEmit)(struct r300_fragment_program_compiler *compiler);
void (* FragmentProgramDump)(union rX00_fragment_program_code *code);
GLboolean (* SetupPixelShader)(GLcontext *ctx);
};

10
src/mesa/drivers/dri/r300/r300_fragprog.c
View file

@ -464,19 +464,19 @@ void r300TranslateFragmentShader(GLcontext *ctx, struct gl_fragment_program *fp)
r300_fp->translated = GL_TRUE;
if (r300_fp->error || (RADEON_DEBUG & DEBUG_PIXEL))
r300FragmentProgramDump(r300_fp, &r300_fp->code.r300);
r300UpdateStateParameters(ctx, _NEW_PROGRAM);
if (r300_fp->error || (RADEON_DEBUG & DEBUG_PIXEL))
r300->vtbl.FragmentProgramDump(&r300_fp->code);
}
update_params(ctx, fp);
}
/* just some random things... */
void r300FragmentProgramDump(
struct r300_fragment_program *fp,
struct r300_fragment_program_code *code)
void r300FragmentProgramDump(union rX00_fragment_program_code *c)
{
struct r300_fragment_program_code *code = &c->r300;
int n, i, j;
static int pc = 0;

5
src/mesa/drivers/dri/r300/r300_fragprog.h
View file

@ -114,9 +114,6 @@ extern void r300TranslateFragmentShader(GLcontext *ctx, struct gl_fragment_progr
extern GLboolean r300FragmentProgramEmit(struct r300_fragment_program_compiler *compiler);
extern void r300FragmentProgramDump(
struct r300_fragment_program *fp,
struct r300_fragment_program_code *code);
extern void r300FragmentProgramDump(union rX00_fragment_program_code *c);
#endif

2
src/mesa/drivers/dri/r300/r300_state.c
View file

@ -2584,11 +2584,13 @@ void r300InitShaderFunctions(r300ContextPtr r300)
r300->vtbl.SetupFragmentShaderTextures = r500SetupFragmentShaderTextures;
r300->vtbl.TranslateFragmentShader = r500TranslateFragmentShader;
r300->vtbl.FragmentProgramEmit = r500FragmentProgramEmit;
r300->vtbl.FragmentProgramDump = r500FragmentProgramDump;
} else {
r300->vtbl.SetupRSUnit = r300SetupRSUnit;
r300->vtbl.SetupPixelShader = r300SetupPixelShader;
r300->vtbl.SetupFragmentShaderTextures = r300SetupFragmentShaderTextures;
r300->vtbl.TranslateFragmentShader = r300TranslateFragmentShader;
r300->vtbl.FragmentProgramEmit = r300FragmentProgramEmit;
r300->vtbl.FragmentProgramDump = r300FragmentProgramDump;
}
}

21
src/mesa/drivers/dri/r300/r500_fragprog.c
View file

@ -435,8 +435,6 @@ static void build_state(
}
}
static void dump_program(struct r500_fragment_program_code *code);
void r500TranslateFragmentShader(GLcontext *ctx, struct gl_fragment_program *fp)
{
r300ContextPtr r300 = R300_CONTEXT(ctx);
@ -494,24 +492,19 @@ void r500TranslateFragmentShader(GLcontext *ctx, struct gl_fragment_program *fp)
if (!r300->vtbl.FragmentProgramEmit(&compiler))
r300_fp->error = GL_TRUE;
r300_fp->translated = GL_TRUE;
/* Subtle: Rescue any parameters that have been added during transformations */
_mesa_free_parameter_list(fp->Base.Parameters);
fp->Base.Parameters = compiler.program->Parameters;
compiler.program->Parameters = 0;
_mesa_reference_program(ctx, &compiler.program, 0);
_mesa_reference_program(ctx, &compiler.program, NULL);
r300_fp->translated = GL_TRUE;
r300UpdateStateParameters(ctx, _NEW_PROGRAM);
if (RADEON_DEBUG & DEBUG_PIXEL) {
if (!r300_fp->error) {
_mesa_printf("Machine-readable code:\n");
dump_program(&r300_fp->code.r500);
}
}
if (r300_fp->error || (RADEON_DEBUG & DEBUG_PIXEL))
r300->vtbl.FragmentProgramDump(&r300_fp->code);
}
update_params(ctx, fp);
@ -615,9 +608,9 @@ static char *to_texop(int val)
return NULL;
}
static void dump_program(struct r500_fragment_program_code *code)
void r500FragmentProgramDump(union rX00_fragment_program_code *c)
{
struct r500_fragment_program_code *code = &c->r500;
fprintf(stderr, "R500 Fragment Program:\n--------\n");
int n;

1
src/mesa/drivers/dri/r300/r500_fragprog.h
View file

@ -49,4 +49,5 @@ extern void r500TranslateFragmentShader(GLcontext *ctx, struct gl_fragment_progr
extern GLboolean r500FragmentProgramEmit(struct r300_fragment_program_compiler *compiler);
extern void r500FragmentProgramDump(union rX00_fragment_program_code *c);
#endif