/**************************************************************************
*
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2008 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
}
+static void
+emit_property(struct tgsi_transform_context *ctx,
+ const struct tgsi_full_property *prop)
+{
+ uint ti = ctx->ti;
+
+ ti += tgsi_build_full_property(prop,
+ ctx->tokens_out + ti,
+ ctx->header,
+ ctx->max_tokens_out - ti);
+ ctx->ti = ti;
+}
+
/**
* Apply user-defined transformations to the input shader to produce
struct tgsi_transform_context *ctx)
{
uint procType;
+ boolean first_instruction = TRUE;
+ boolean epilog_emitted = FALSE;
+ int cond_stack = 0;
+ int call_stack = 0;
/* input shader */
struct tgsi_parse_context parse;
ctx->emit_instruction = emit_instruction;
ctx->emit_declaration = emit_declaration;
ctx->emit_immediate = emit_immediate;
+ ctx->emit_property = emit_property;
ctx->tokens_out = tokens_out;
ctx->max_tokens_out = max_tokens_out;
return -1;
}
procType = parse.FullHeader.Processor.Processor;
- assert(procType == TGSI_PROCESSOR_FRAGMENT ||
- procType == TGSI_PROCESSOR_VERTEX ||
- procType == TGSI_PROCESSOR_GEOMETRY);
-
/**
** Setup output shader
**/
- *(struct tgsi_version *) &tokens_out[0] = tgsi_build_version();
-
- ctx->header = (struct tgsi_header *) (tokens_out + 1);
+ ctx->header = (struct tgsi_header *)tokens_out;
*ctx->header = tgsi_build_header();
- processor = (struct tgsi_processor *) (tokens_out + 2);
+ processor = (struct tgsi_processor *) (tokens_out + 1);
*processor = tgsi_build_processor( procType, ctx->header );
- ctx->ti = 3;
+ ctx->ti = 2;
/**
{
struct tgsi_full_instruction *fullinst
= &parse.FullToken.FullInstruction;
-
- if (ctx->transform_instruction)
- ctx->transform_instruction(ctx, fullinst);
- else
+ enum tgsi_opcode opcode = fullinst->Instruction.Opcode;
+
+ if (first_instruction && ctx->prolog) {
+ ctx->prolog(ctx);
+ }
+
+ /*
+ * XXX Note: we handle the case of ret in main.
+ * However, the output redirections done by transform
+ * have their limits with control flow and will generally
+ * not work correctly. e.g.
+ * if (cond) {
+ * oColor = x;
+ * ret;
+ * }
+ * oColor = y;
+ * end;
+ * If the color output is redirected to a temp and modified
+ * by a transform, this will not work (the oColor assignment
+ * in the conditional will never make it to the actual output).
+ */
+ if ((opcode == TGSI_OPCODE_END || opcode == TGSI_OPCODE_RET) &&
+ call_stack == 0 && ctx->epilog && !epilog_emitted) {
+ if (opcode == TGSI_OPCODE_RET && cond_stack != 0) {
+ assert(!"transform ignoring RET in main");
+ } else {
+ assert(cond_stack == 0);
+ /* Emit caller's epilog */
+ ctx->epilog(ctx);
+ epilog_emitted = TRUE;
+ }
+ /* Emit END (or RET) */
ctx->emit_instruction(ctx, fullinst);
+ }
+ else {
+ switch (opcode) {
+ case TGSI_OPCODE_IF:
+ case TGSI_OPCODE_UIF:
+ case TGSI_OPCODE_SWITCH:
+ case TGSI_OPCODE_BGNLOOP:
+ cond_stack++;
+ break;
+ case TGSI_OPCODE_CAL:
+ call_stack++;
+ break;
+ case TGSI_OPCODE_ENDIF:
+ case TGSI_OPCODE_ENDSWITCH:
+ case TGSI_OPCODE_ENDLOOP:
+ assert(cond_stack > 0);
+ cond_stack--;
+ break;
+ case TGSI_OPCODE_ENDSUB:
+ assert(call_stack > 0);
+ call_stack--;
+ break;
+ case TGSI_OPCODE_BGNSUB:
+ case TGSI_OPCODE_RET:
+ default:
+ break;
+ }
+ if (ctx->transform_instruction)
+ ctx->transform_instruction(ctx, fullinst);
+ else
+ ctx->emit_instruction(ctx, fullinst);
+ }
+
+ first_instruction = FALSE;
}
break;
ctx->emit_immediate(ctx, fullimm);
}
break;
+ case TGSI_TOKEN_TYPE_PROPERTY:
+ {
+ struct tgsi_full_property *fullprop
+ = &parse.FullToken.FullProperty;
+
+ if (ctx->transform_property)
+ ctx->transform_property(ctx, fullprop);
+ else
+ ctx->emit_property(ctx, fullprop);
+ }
+ break;
default:
assert( 0 );
}
}
-
- if (ctx->epilog) {
- ctx->epilog(ctx);
- }
+ assert(call_stack == 0);
tgsi_parse_free (&parse);
uint max_tokens_out )
{
const char *text =
- "FRAG1.1\n"
+ "FRAG\n"
"DCL IN[0], COLOR, CONSTANT\n"
"DCL OUT[0], COLOR\n"
" 0: MOV OUT[0], IN[0]\n"