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

Get rid of BRK0, BRK1, CONT0, CONT1 instructions.

Browse source
This commit is contained in:
Brian 2007-03-28 14:23:33 -06:00
parent 1bbd69251b
commit 3e7d43cd48
5 changed files with 0 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/mesa/shader/prog_execute.c
View file

@ -727,32 +727,6 @@ _mesa_execute_program(GLcontext * ctx,
pc = inst->BranchTarget - 1;
}
break;
case OPCODE_BRK0: /* Break if zero */
/* fall-through */
case OPCODE_CONT0: /* Continue if zero */
{
GLfloat a[4];
fetch_vector1(&inst->SrcReg[0], machine, a);
if (a[0] == 0.0) {
/* take branch */
/* Subtract 1 here since we'll do pc++ at end of for-loop */
pc = inst->BranchTarget - 1;
}
}
break;
case OPCODE_BRK1: /* Break if non-zero */
/* fall-through */
case OPCODE_CONT1: /* Continue if non-zero */
{
GLfloat a[4];
fetch_vector1(&inst->SrcReg[0], machine, a);
if (a[0] != 0.0) {
/* take branch */
/* Subtract 1 here since we'll do pc++ at end of for-loop */
pc = inst->BranchTarget - 1;
}
}
break;
case OPCODE_CAL: /* Call subroutine (conditional) */
if (eval_condition(machine, inst)) {
/* call the subroutine */

4
src/mesa/shader/prog_instruction.c
View file

@ -138,13 +138,9 @@ static const struct instruction_info InstInfo[MAX_OPCODE] = {
{ OPCODE_BGNSUB, "BGNSUB", 0 },
{ OPCODE_BRA, "BRA", 0 },
{ OPCODE_BRK, "BRK", 0 },
{ OPCODE_BRK0, "BRK0", 1 },
{ OPCODE_BRK1, "BRK1", 1 },
{ OPCODE_CAL, "CAL", 0 },
{ OPCODE_CMP, "CMP", 3 },
{ OPCODE_CONT, "CONT", 0 },
{ OPCODE_CONT0, "CONT0", 1 },
{ OPCODE_CONT1, "CONT1", 1 },
{ OPCODE_COS, "COS", 1 },
{ OPCODE_DDX, "DDX", 1 },
{ OPCODE_DDY, "DDY", 1 },

4
src/mesa/shader/prog_instruction.h
View file

@ -153,13 +153,9 @@ typedef enum prog_opcode {
OPCODE_BGNSUB, /* opt */
OPCODE_BRA, /* 2 X */
OPCODE_BRK, /* 2 opt */
OPCODE_BRK0, /* opt */
OPCODE_BRK1, /* opt */
OPCODE_CAL, /* 2 2 */
OPCODE_CMP, /* X */
OPCODE_CONT, /* opt */
OPCODE_CONT0, /* opt */
OPCODE_CONT1, /* opt */
OPCODE_COS, /* X 2 X X */
OPCODE_DDX, /* X X */
OPCODE_DDY, /* X X */

11
src/mesa/shader/prog_print.c
View file

@ -606,17 +606,6 @@ _mesa_print_instruction_opt(const struct prog_instruction *inst, GLint indent,
print_comment(inst);
break;
case OPCODE_BRK0:
case OPCODE_BRK1:
case OPCODE_CONT0:
case OPCODE_CONT1:
_mesa_printf("%s ", _mesa_opcode_string(inst->Opcode));
print_src_reg(&inst->SrcReg[0], mode, prog);
_mesa_printf("; ");
_mesa_printf(" # (goto %d)", inst->BranchTarget);
print_comment(inst);
break;
case OPCODE_BGNSUB:
if (mode == PROG_PRINT_NV) {
_mesa_printf("%s:\n", inst->Comment); /* comment is label */

4
src/mesa/tnl/t_vb_arbprogram.c
View file

@ -741,13 +741,9 @@ static gpu_function opcode_func[MAX_OPCODE+3] =
do_NOP,/*BGNSUB*/
do_NOP,/*BRA*/
do_NOP,/*BRK*/
do_NOP,/*BRK0*/
do_NOP,/*BRK1*/
do_NOP,/*CAL*/
do_NOP,/*CMP*/
do_NOP,/*CONT*/
do_NOP,/*CONT0*/
do_NOP,/*CONT1*/
do_NOP,/*COS*/
do_NOP,/*DDX*/
do_NOP,/*DDY*/