projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r200/i915/st/mesa/compiler: use common inputs read field
[mesa.git]
/
src
/
mesa
/
swrast
/
s_atifragshader.c
diff --git
a/src/mesa/swrast/s_atifragshader.c
b/src/mesa/swrast/s_atifragshader.c
index 1338b6802d4285f8289ee842bc4a33cf4af37828..414a4144e25fc9ce5e4321663d58e569f7dbe47e 100644
(file)
--- a/
src/mesa/swrast/s_atifragshader.c
+++ b/
src/mesa/swrast/s_atifragshader.c
@@
-20,12
+20,14
@@
*/
#include "main/glheader.h"
*/
#include "main/glheader.h"
-#include "main/colormac.h"
#include "main/macros.h"
#include "main/atifragshader.h"
#include "main/macros.h"
#include "main/atifragshader.h"
+#include "main/samplerobj.h"
#include "swrast/s_atifragshader.h"
#include "swrast/s_context.h"
#include "swrast/s_atifragshader.h"
#include "swrast/s_context.h"
+#define ATI_FS_INPUT_PRIMARY 0
+#define ATI_FS_INPUT_SECONDARY 1
/**
* State for executing ATI fragment shader.
/**
* State for executing ATI fragment shader.
@@
-43,14
+45,15
@@
struct atifs_machine
* Fetch a texel.
*/
static void
* Fetch a texel.
*/
static void
-fetch_texel(
GL
context * ctx, const GLfloat texcoord[4], GLfloat lambda,
+fetch_texel(
struct gl_
context * ctx, const GLfloat texcoord[4], GLfloat lambda,
GLuint unit, GLfloat color[4])
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
/* XXX use a float-valued TextureSample routine here!!! */
GLuint unit, GLfloat color[4])
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
/* XXX use a float-valued TextureSample routine here!!! */
- swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current,
- 1, (const GLfloat(*)[4]) texcoord,
+ swrast->TextureSample[unit](ctx, _mesa_get_samplerobj(ctx, unit),
+ ctx->Texture.Unit[unit]._Current,
+ 1, (const GLfloat(*)[4]) texcoord,
&lambda, (GLfloat (*)[4]) color);
}
&lambda, (GLfloat (*)[4]) color);
}
@@
-235,21
+238,6
@@
finish_pass(struct atifs_machine *machine)
}
}
}
}
-struct ati_fs_opcode_st ati_fs_opcodes[] = {
- {GL_ADD_ATI, 2},
- {GL_SUB_ATI, 2},
- {GL_MUL_ATI, 2},
- {GL_MAD_ATI, 3},
- {GL_LERP_ATI, 3},
- {GL_MOV_ATI, 1},
- {GL_CND_ATI, 3},
- {GL_CND0_ATI, 3},
- {GL_DOT2_ADD_ATI, 3},
- {GL_DOT3_ATI, 2},
- {GL_DOT4_ATI, 2}
-};
-
-
static void
handle_pass_op(struct atifs_machine *machine, struct atifs_setupinst *texinst,
static void
handle_pass_op(struct atifs_machine *machine, struct atifs_setupinst *texinst,
@@
-261,7
+249,7
@@
handle_pass_op(struct atifs_machine *machine, struct atifs_setupinst *texinst,
if (pass_tex >= GL_TEXTURE0_ARB && pass_tex <= GL_TEXTURE7_ARB) {
pass_tex -= GL_TEXTURE0_ARB;
COPY_4V(machine->Registers[idx],
if (pass_tex >= GL_TEXTURE0_ARB && pass_tex <= GL_TEXTURE7_ARB) {
pass_tex -= GL_TEXTURE0_ARB;
COPY_4V(machine->Registers[idx],
- span->array->attribs[
FRAG_ATTRIB
_TEX0 + pass_tex][column]);
+ span->array->attribs[
VARYING_SLOT
_TEX0 + pass_tex][column]);
}
else if (pass_tex >= GL_REG_0_ATI && pass_tex <= GL_REG_5_ATI) {
pass_tex -= GL_REG_0_ATI;
}
else if (pass_tex >= GL_REG_0_ATI && pass_tex <= GL_REG_5_ATI) {
pass_tex -= GL_REG_0_ATI;
@@
-272,7
+260,7
@@
handle_pass_op(struct atifs_machine *machine, struct atifs_setupinst *texinst,
}
static void
}
static void
-handle_sample_op(
GL
context * ctx, struct atifs_machine *machine,
+handle_sample_op(
struct gl_
context * ctx, struct atifs_machine *machine,
struct atifs_setupinst *texinst, const SWspan *span,
GLuint column, GLuint idx)
{
struct atifs_setupinst *texinst, const SWspan *span,
GLuint column, GLuint idx)
{
@@
-284,7
+272,7
@@
handle_sample_op(GLcontext * ctx, struct atifs_machine *machine,
if (coord_source >= GL_TEXTURE0_ARB && coord_source <= GL_TEXTURE7_ARB) {
coord_source -= GL_TEXTURE0_ARB;
COPY_4V(tex_coords,
if (coord_source >= GL_TEXTURE0_ARB && coord_source <= GL_TEXTURE7_ARB) {
coord_source -= GL_TEXTURE0_ARB;
COPY_4V(tex_coords,
- span->array->attribs[
FRAG_ATTRIB
_TEX0 + coord_source][column]);
+ span->array->attribs[
VARYING_SLOT
_TEX0 + coord_source][column]);
}
else if (coord_source >= GL_REG_0_ATI && coord_source <= GL_REG_5_ATI) {
coord_source -= GL_REG_0_ATI;
}
else if (coord_source >= GL_REG_0_ATI && coord_source <= GL_REG_5_ATI) {
coord_source -= GL_REG_0_ATI;
@@
-311,7
+299,7
@@
do { \
* \param column - which pixel [i] we're operating on in the span
*/
static void
* \param column - which pixel [i] we're operating on in the span
*/
static void
-execute_shader(
GL
context *ctx, const struct ati_fragment_shader *shader,
+execute_shader(
struct gl_
context *ctx, const struct ati_fragment_shader *shader,
struct atifs_machine *machine, const SWspan *span,
GLuint column)
{
struct atifs_machine *machine, const SWspan *span,
GLuint column)
{
@@
-450,13
+438,13
@@
execute_shader(GLcontext *ctx, const struct ati_fragment_shader *shader,
for (i = 0; i < 3; i++) {
dst[optype][i] =
(src[optype][2][i] >
for (i = 0; i < 3; i++) {
dst[optype][i] =
(src[optype][2][i] >
- 0.5) ? src[optype][0][i] : src[optype][1][i];
+ 0.5
F
) ? src[optype][0][i] : src[optype][1][i];
}
}
else {
dst[optype][3] =
(src[optype][2][3] >
}
}
else {
dst[optype][3] =
(src[optype][2][3] >
- 0.5) ? src[optype][0][3] : src[optype][1][3];
+ 0.5
F
) ? src[optype][0][3] : src[optype][1][3];
}
break;
}
break;
@@
-555,7
+543,7
@@
execute_shader(GLcontext *ctx, const struct ati_fragment_shader *shader,
* Init fragment shader virtual machine state.
*/
static void
* Init fragment shader virtual machine state.
*/
static void
-init_machine(
GL
context * ctx, struct atifs_machine *machine,
+init_machine(
struct gl_
context * ctx, struct atifs_machine *machine,
const struct ati_fragment_shader *shader,
const SWspan *span, GLuint col)
{
const struct ati_fragment_shader *shader,
const SWspan *span, GLuint col)
{
@@
-567,8
+555,8
@@
init_machine(GLcontext * ctx, struct atifs_machine *machine,
machine->Registers[i][j] = 0.0;
}
machine->Registers[i][j] = 0.0;
}
- COPY_4V(inputs[ATI_FS_INPUT_PRIMARY], span->array->attribs[
FRAG_ATTRIB
_COL0][col]);
- COPY_4V(inputs[ATI_FS_INPUT_SECONDARY], span->array->attribs[
FRAG_ATTRIB
_COL1][col]);
+ COPY_4V(inputs[ATI_FS_INPUT_PRIMARY], span->array->attribs[
VARYING_SLOT
_COL0][col]);
+ COPY_4V(inputs[ATI_FS_INPUT_SECONDARY], span->array->attribs[
VARYING_SLOT
_COL1][col]);
}
}
@@
-577,14
+565,14
@@
init_machine(GLcontext * ctx, struct atifs_machine *machine,
* Execute the current ATI shader program, operating on the given span.
*/
void
* Execute the current ATI shader program, operating on the given span.
*/
void
-_swrast_exec_fragment_shader(
GL
context * ctx, SWspan *span)
+_swrast_exec_fragment_shader(
struct gl_
context * ctx, SWspan *span)
{
const struct ati_fragment_shader *shader = ctx->ATIFragmentShader.Current;
struct atifs_machine machine;
GLuint i;
/* incoming colors should be floats */
{
const struct ati_fragment_shader *shader = ctx->ATIFragmentShader.Current;
struct atifs_machine machine;
GLuint i;
/* incoming colors should be floats */
-
ASSERT
(span->array->ChanType == GL_FLOAT);
+
assert
(span->array->ChanType == GL_FLOAT);
for (i = 0; i < span->end; i++) {
if (span->array->mask[i]) {
for (i = 0; i < span->end; i++) {
if (span->array->mask[i]) {
@@
-597,7
+585,7
@@
_swrast_exec_fragment_shader(GLcontext * ctx, SWspan *span)
const GLfloat *colOut = machine.Registers[0];
/*fprintf(stderr,"outputs %f %f %f %f\n",
colOut[0], colOut[1], colOut[2], colOut[3]); */
const GLfloat *colOut = machine.Registers[0];
/*fprintf(stderr,"outputs %f %f %f %f\n",
colOut[0], colOut[1], colOut[2], colOut[3]); */
- COPY_4V(span->array->attribs[
FRAG_ATTRIB
_COL0][i], colOut);
+ COPY_4V(span->array->attribs[
VARYING_SLOT
_COL0][i], colOut);
}
}
}
}
}
}