projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa|mapi: replace _mesa_[v]snprintf with [v]snprintf
[mesa.git]
/
src
/
mesa
/
program
/
prog_instruction.c
diff --git
a/src/mesa/program/prog_instruction.c
b/src/mesa/program/prog_instruction.c
index 254c0128fcd8ca9d4dd1986f05a12fda248aa16c..4673dd59a245b52ece2b3a965b0e81c59762be35 100644
(file)
--- a/
src/mesa/program/prog_instruction.c
+++ b/
src/mesa/program/prog_instruction.c
@@
-25,9
+25,9
@@
#include "main/glheader.h"
#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
+#include "util/imports.h"
#include "prog_instruction.h"
#include "prog_instruction.h"
+#include "prog_parameter.h"
/**
/**
@@
-52,28
+52,12
@@
_mesa_init_instructions(struct prog_instruction *inst, GLuint count)
inst[i].DstReg.File = PROGRAM_UNDEFINED;
inst[i].DstReg.WriteMask = WRITEMASK_XYZW;
inst[i].DstReg.File = PROGRAM_UNDEFINED;
inst[i].DstReg.WriteMask = WRITEMASK_XYZW;
- inst[i].DstReg.CondMask = COND_TR;
- inst[i].DstReg.CondSwizzle = SWIZZLE_NOOP;
- inst[i].SaturateMode = SATURATE_OFF;
- inst[i].Precision = FLOAT32;
+ inst[i].Saturate = GL_FALSE;
}
}
}
}
-/**
- * Allocate an array of program instructions.
- * \param numInst number of instructions
- * \return pointer to instruction memory
- */
-struct prog_instruction *
-_mesa_alloc_instructions(GLuint numInst)
-{
- return
- calloc(numInst, sizeof(struct prog_instruction));
-}
-
-
/**
* Copy an array of program instructions.
* \param dest pointer to destination.
/**
* Copy an array of program instructions.
* \param dest pointer to destination.
@@
-85,36
+69,17
@@
struct prog_instruction *
_mesa_copy_instructions(struct prog_instruction *dest,
const struct prog_instruction *src, GLuint n)
{
_mesa_copy_instructions(struct prog_instruction *dest,
const struct prog_instruction *src, GLuint n)
{
- GLuint i;
memcpy(dest, src, n * sizeof(struct prog_instruction));
memcpy(dest, src, n * sizeof(struct prog_instruction));
- for (i = 0; i < n; i++) {
- if (src[i].Comment)
- dest[i].Comment = _mesa_strdup(src[i].Comment);
- }
return dest;
}
return dest;
}
-/**
- * Free an array of instructions
- */
-void
-_mesa_free_instructions(struct prog_instruction *inst, GLuint count)
-{
- GLuint i;
- for (i = 0; i < count; i++) {
- free((char *)inst[i].Comment);
- }
- free(inst);
-}
-
-
/**
* Basic info about each instruction
*/
struct instruction_info
{
/**
* Basic info about each instruction
*/
struct instruction_info
{
-
gl_inst
_opcode Opcode;
+
enum prog
_opcode Opcode;
const char *Name;
GLuint NumSrcRegs;
GLuint NumDstRegs;
const char *Name;
GLuint NumSrcRegs;
GLuint NumDstRegs;
@@
-154,7
+119,6
@@
static const struct instruction_info InstInfo[MAX_OPCODE] = {
{ OPCODE_FRC, "FRC", 1, 1 },
{ OPCODE_IF, "IF", 1, 0 },
{ OPCODE_KIL, "KIL", 1, 0 },
{ OPCODE_FRC, "FRC", 1, 1 },
{ OPCODE_IF, "IF", 1, 0 },
{ OPCODE_KIL, "KIL", 1, 0 },
- { OPCODE_KIL_NV, "KIL_NV", 0, 0 },
{ OPCODE_LG2, "LG2", 1, 1 },
{ OPCODE_LIT, "LIT", 1, 1 },
{ OPCODE_LOG, "LOG", 1, 1 },
{ OPCODE_LG2, "LG2", 1, 1 },
{ OPCODE_LIT, "LIT", 1, 1 },
{ OPCODE_LOG, "LOG", 1, 1 },
@@
-173,13
+137,9
@@
static const struct instruction_info InstInfo[MAX_OPCODE] = {
{ OPCODE_RET, "RET", 0, 0 },
{ OPCODE_RSQ, "RSQ", 1, 1 },
{ OPCODE_SCS, "SCS", 1, 1 },
{ OPCODE_RET, "RET", 0, 0 },
{ OPCODE_RSQ, "RSQ", 1, 1 },
{ OPCODE_SCS, "SCS", 1, 1 },
- { OPCODE_SEQ, "SEQ", 2, 1 },
{ OPCODE_SGE, "SGE", 2, 1 },
{ OPCODE_SGE, "SGE", 2, 1 },
- { OPCODE_SGT, "SGT", 2, 1 },
{ OPCODE_SIN, "SIN", 1, 1 },
{ OPCODE_SIN, "SIN", 1, 1 },
- { OPCODE_SLE, "SLE", 2, 1 },
{ OPCODE_SLT, "SLT", 2, 1 },
{ OPCODE_SLT, "SLT", 2, 1 },
- { OPCODE_SNE, "SNE", 2, 1 },
{ OPCODE_SSG, "SSG", 1, 1 },
{ OPCODE_SUB, "SUB", 2, 1 },
{ OPCODE_SWZ, "SWZ", 1, 1 },
{ OPCODE_SSG, "SSG", 1, 1 },
{ OPCODE_SUB, "SUB", 2, 1 },
{ OPCODE_SWZ, "SWZ", 1, 1 },
@@
-188,7
+148,6
@@
static const struct instruction_info InstInfo[MAX_OPCODE] = {
{ OPCODE_TXD, "TXD", 3, 1 },
{ OPCODE_TXL, "TXL", 1, 1 },
{ OPCODE_TXP, "TXP", 1, 1 },
{ OPCODE_TXD, "TXD", 3, 1 },
{ OPCODE_TXL, "TXL", 1, 1 },
{ OPCODE_TXP, "TXP", 1, 1 },
- { OPCODE_TXP_NV, "TXP_NV", 1, 1 },
{ OPCODE_TRUNC, "TRUNC", 1, 1 },
{ OPCODE_XPD, "XPD", 2, 1 }
};
{ OPCODE_TRUNC, "TRUNC", 1, 1 },
{ OPCODE_XPD, "XPD", 2, 1 }
};
@@
-198,11
+157,11
@@
static const struct instruction_info InstInfo[MAX_OPCODE] = {
* Return the number of src registers for the given instruction/opcode.
*/
GLuint
* Return the number of src registers for the given instruction/opcode.
*/
GLuint
-_mesa_num_inst_src_regs(
gl_inst
_opcode opcode)
+_mesa_num_inst_src_regs(
enum prog
_opcode opcode)
{
{
-
ASSERT
(opcode < MAX_OPCODE);
-
ASSERT
(opcode == InstInfo[opcode].Opcode);
-
ASSERT
(OPCODE_XPD == InstInfo[OPCODE_XPD].Opcode);
+
assert
(opcode < MAX_OPCODE);
+
assert
(opcode == InstInfo[opcode].Opcode);
+
assert
(OPCODE_XPD == InstInfo[OPCODE_XPD].Opcode);
return InstInfo[opcode].NumSrcRegs;
}
return InstInfo[opcode].NumSrcRegs;
}
@@
-211,17
+170,17
@@
_mesa_num_inst_src_regs(gl_inst_opcode opcode)
* Return the number of dst registers for the given instruction/opcode.
*/
GLuint
* Return the number of dst registers for the given instruction/opcode.
*/
GLuint
-_mesa_num_inst_dst_regs(
gl_inst
_opcode opcode)
+_mesa_num_inst_dst_regs(
enum prog
_opcode opcode)
{
{
-
ASSERT
(opcode < MAX_OPCODE);
-
ASSERT
(opcode == InstInfo[opcode].Opcode);
-
ASSERT
(OPCODE_XPD == InstInfo[OPCODE_XPD].Opcode);
+
assert
(opcode < MAX_OPCODE);
+
assert
(opcode == InstInfo[opcode].Opcode);
+
assert
(OPCODE_XPD == InstInfo[OPCODE_XPD].Opcode);
return InstInfo[opcode].NumDstRegs;
}
GLboolean
return InstInfo[opcode].NumDstRegs;
}
GLboolean
-_mesa_is_tex_instruction(
gl_inst
_opcode opcode)
+_mesa_is_tex_instruction(
enum prog
_opcode opcode)
{
return (opcode == OPCODE_TEX ||
opcode == OPCODE_TXB ||
{
return (opcode == OPCODE_TEX ||
opcode == OPCODE_TXB ||
@@
-285,13
+244,13
@@
_mesa_check_soa_dependencies(const struct prog_instruction *inst)
* Return string name for given program opcode.
*/
const char *
* Return string name for given program opcode.
*/
const char *
-_mesa_opcode_string(
gl_inst
_opcode opcode)
+_mesa_opcode_string(
enum prog
_opcode opcode)
{
if (opcode < MAX_OPCODE)
return InstInfo[opcode].Name;
else {
static char s[20];
{
if (opcode < MAX_OPCODE)
return InstInfo[opcode].Name;
else {
static char s[20];
-
_mesa_
snprintf(s, sizeof(s), "OP%u", opcode);
+ snprintf(s, sizeof(s), "OP%u", opcode);
return s;
}
}
return s;
}
}