From 953a309de9204490edcd011e700c06c7c25c0b9e Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 11 Apr 2010 23:00:16 +0200 Subject: r300g: FS constants emission rework * The constant buffer emission is separated from RC state variables emission. * The immediates are emitted with FS code. --- src/gallium/drivers/r300/r300_fs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/gallium/drivers/r300/r300_fs.c') diff --git a/src/gallium/drivers/r300/r300_fs.c b/src/gallium/drivers/r300/r300_fs.c index c3f51ec932..4969c1472b 100644 --- a/src/gallium/drivers/r300/r300_fs.c +++ b/src/gallium/drivers/r300/r300_fs.c @@ -192,6 +192,7 @@ static void r300_translate_fragment_shader( struct r300_fragment_program_compiler compiler; struct tgsi_to_rc ttr; int wpos; + unsigned i; tgsi_scan_shader(tokens, &shader->info); r300_shader_read_fs_inputs(&shader->info, &shader->inputs); @@ -240,6 +241,7 @@ static void r300_translate_fragment_shader( /* Invoke the compiler */ r3xx_compile_fragment_program(&compiler); + if (compiler.Base.Error) { fprintf(stderr, "r300 FP: Compiler Error:\n%sUsing a dummy shader" " instead.\n", compiler.Base.ErrorMsg); @@ -252,6 +254,24 @@ static void r300_translate_fragment_shader( r300_dummy_fragment_shader(r300, shader); } + /* Initialize numbers of constants for each type. */ + shader->externals_count = ttr.immediate_offset; + shader->immediates_count = 0; + shader->rc_state_count = 0; + + for (i = shader->externals_count; i < shader->code.constants.Count; i++) { + switch (shader->code.constants.Constants[i].Type) { + case RC_CONSTANT_IMMEDIATE: + ++shader->immediates_count; + break; + case RC_CONSTANT_STATE: + ++shader->rc_state_count; + break; + default: + assert(0); + } + } + /* And, finally... */ rc_destroy(&compiler.Base); } -- cgit v1.2.3