summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_mesa_to_tgsi.c
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@vmware.com>2009-12-14 18:36:33 +0100
committerRoland Scheidegger <sroland@vmware.com>2009-12-14 18:36:33 +0100
commita0127b6ced257919180ba3a1bf534b68d9c750be (patch)
tree2b7393c210947a009b654c07da9c4732cc51bade /src/mesa/state_tracker/st_mesa_to_tgsi.c
parenta08e348a84f57ed5e8bf5888f1ce13934d2ce8fa (diff)
gallium: more work for edgeflags changes
fixes, cleanups, etc. not working yet
Diffstat (limited to 'src/mesa/state_tracker/st_mesa_to_tgsi.c')
-rw-r--r--src/mesa/state_tracker/st_mesa_to_tgsi.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 9fd670cac2..72bd17bf41 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -738,11 +738,11 @@ emit_face_var( struct st_translate *t,
*
* \return array of translated tokens, caller's responsibility to free
*/
-const struct tgsi_token *
+enum pipe_error
st_translate_mesa_program(
GLcontext *ctx,
- struct ureg_program *ureg;
uint procType,
+ struct ureg_program *ureg,
const struct gl_program *program,
GLuint numInputs,
const GLuint inputMapping[],
@@ -755,7 +755,6 @@ st_translate_mesa_program(
const ubyte outputSemanticIndex[] )
{
struct st_translate translate, *t;
- const struct tgsi_token *tokens = NULL;
unsigned i;
t = &translate;
@@ -904,16 +903,15 @@ out:
if (t->error) {
debug_printf("%s: translate error flag set\n", __FUNCTION__);
- FREE((void *)tokens);
- tokens = NULL;
}
+/* ???
if (!tokens) {
debug_printf("%s: failed to translate Mesa program:\n", __FUNCTION__);
_mesa_print_program(program);
debug_assert(0);
}
-
+*/
return PIPE_ERROR_OUT_OF_MEMORY;
}