projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: Allows querying GL_SAMPLER_BINDING on GLES3 profile
[mesa.git]
/
src
/
mesa
/
program
/
prog_optimize.c
diff --git
a/src/mesa/program/prog_optimize.c
b/src/mesa/program/prog_optimize.c
index 25d9684b1374d9d4f45d223611f45b451e16f183..60530ebf0191b1784cd6ab320d89de30cab466aa 100644
(file)
--- a/
src/mesa/program/prog_optimize.c
+++ b/
src/mesa/program/prog_optimize.c
@@
-1,6
+1,5
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 7.5
*
* Copyright (C) 2009 VMware, Inc. All Rights Reserved.
*
*
* Copyright (C) 2009 VMware, Inc. All Rights Reserved.
*
@@
-115,7
+114,6
@@
get_src_arg_mask(const struct prog_instruction *inst,
read_mask = 0x0;
for (comp = 0; comp < 4; ++comp) {
const GLuint coord = GET_SWZ(inst->SrcReg[arg].Swizzle, comp);
read_mask = 0x0;
for (comp = 0; comp < 4; ++comp) {
const GLuint coord = GET_SWZ(inst->SrcReg[arg].Swizzle, comp);
- ASSERT(coord < 4);
if (channel_mask & (1 << comp) && coord <= SWIZZLE_W)
read_mask |= 1 << coord;
}
if (channel_mask & (1 << comp) && coord <= SWIZZLE_W)
read_mask |= 1 << coord;
}
@@
-260,8
+258,8
@@
_mesa_remove_dead_code_global(struct gl_program *prog)
/*_mesa_print_program(prog);*/
}
/*_mesa_print_program(prog);*/
}
- removeInst =
(GLboolean *)
- calloc(
1, prog->NumInstructions *
sizeof(GLboolean));
+ removeInst =
+ calloc(
prog->NumInstructions,
sizeof(GLboolean));
/* Determine which temps are read and written */
for (i = 0; i < prog->NumInstructions; i++) {
/* Determine which temps are read and written */
for (i = 0; i < prog->NumInstructions; i++) {
@@
-285,11
+283,11
@@
_mesa_remove_dead_code_global(struct gl_program *prog)
for (comp = 0; comp < 4; comp++) {
const GLuint swz = GET_SWZ(inst->SrcReg[j].Swizzle, comp);
for (comp = 0; comp < 4; comp++) {
const GLuint swz = GET_SWZ(inst->SrcReg[j].Swizzle, comp);
- ASSERT(swz < 4);
- if ((read_mask & (1 << swz)) == 0)
- continue;
- if (swz <= SWIZZLE_W)
+ if (swz <= SWIZZLE_W) {
+ if ((read_mask & (1 << swz)) == 0)
+ continue;
tempRead[index][swz] = GL_TRUE;
tempRead[index][swz] = GL_TRUE;
+ }
}
}
}
}
}
}
@@
-392,7
+390,6
@@
find_next_use(const struct gl_program *prog,
switch (inst->Opcode) {
case OPCODE_BGNLOOP:
case OPCODE_BGNSUB:
switch (inst->Opcode) {
case OPCODE_BGNLOOP:
case OPCODE_BGNSUB:
- case OPCODE_BRA:
case OPCODE_CAL:
case OPCODE_CONT:
case OPCODE_IF:
case OPCODE_CAL:
case OPCODE_CONT:
case OPCODE_IF:
@@
-439,7
+436,6
@@
_mesa_is_flow_control_opcode(enum prog_opcode opcode)
switch (opcode) {
case OPCODE_BGNLOOP:
case OPCODE_BGNSUB:
switch (opcode) {
case OPCODE_BGNLOOP:
case OPCODE_BGNSUB:
- case OPCODE_BRA:
case OPCODE_CAL:
case OPCODE_CONT:
case OPCODE_IF:
case OPCODE_CAL:
case OPCODE_CONT:
case OPCODE_IF:
@@
-604,8
+600,8
@@
_mesa_remove_dead_code_local(struct gl_program *prog)
GLboolean *removeInst;
GLuint i, arg, rem = 0;
GLboolean *removeInst;
GLuint i, arg, rem = 0;
- removeInst =
(GLboolean *)
- calloc(
1, prog->NumInstructions *
sizeof(GLboolean));
+ removeInst =
+ calloc(
prog->NumInstructions,
sizeof(GLboolean));
for (i = 0; i < prog->NumInstructions; i++) {
const struct prog_instruction *inst = prog->Instructions + i;
for (i = 0; i < prog->NumInstructions; i++) {
const struct prog_instruction *inst = prog->Instructions + i;
@@
-745,8
+741,8
@@
_mesa_remove_extra_moves(struct gl_program *prog)
_mesa_print_program(prog);
}
_mesa_print_program(prog);
}
- removeInst =
(GLboolean *)
- calloc(
1, prog->NumInstructions *
sizeof(GLboolean));
+ removeInst =
+ calloc(
prog->NumInstructions,
sizeof(GLboolean));
/*
* Look for sequences such as this:
/*
* Look for sequences such as this:
@@
-791,7
+787,6
@@
_mesa_remove_extra_moves(struct gl_program *prog)
if (prevInst->DstReg.File == PROGRAM_TEMPORARY &&
prevInst->DstReg.Index == id &&
prevInst->DstReg.RelAddr == 0 &&
if (prevInst->DstReg.File == PROGRAM_TEMPORARY &&
prevInst->DstReg.Index == id &&
prevInst->DstReg.RelAddr == 0 &&
- prevInst->DstReg.CondSrc == 0 &&
prevInst->DstReg.CondMask == COND_TR) {
const GLuint dst_mask = prevInst->DstReg.WriteMask;
prevInst->DstReg.CondMask == COND_TR) {
const GLuint dst_mask = prevInst->DstReg.WriteMask;