fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-24 12:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

r300: Do not include r300_fragprog.h from r300_context.h and other cleanups

Browse source
This commit is contained in:
Nicolai Haehnle 2008-06-13 22:09:37 +02:00
parent caeabb1ebe
commit e2aa45c2f9
5 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/r300/r300_context.h
View file

@ -73,7 +73,6 @@ typedef struct r300_context *r300ContextPtr;
}
#include "r300_vertprog.h"
#include "r300_fragprog.h"
#include "r500_fragprog.h"
/**

34
src/mesa/drivers/dri/r300/r300_fragprog.c
View file

@ -445,8 +445,8 @@ static int get_hw_temp(struct r300_pfs_compile_state *cs, int slot)
cs->hwtemps[r].vector_valid = 0;
cs->hwtemps[r].scalar_valid = 0;
if (r > fp->code.max_temp_idx)
fp->code.max_temp_idx = r;
if (r > code->max_temp_idx)
code->max_temp_idx = r;
return r;
}
@ -1029,11 +1029,11 @@ static void emit_tex(struct r300_pfs_compile_state *cs,
tokens[2] = unit;
factor_index =
_mesa_add_state_reference(cs->fp->mesa_program.Base.
_mesa_add_state_reference(fp->mesa_program.Base.
Parameters, tokens);
factorreg =
emit_const4fv(cs,
cs->fp->mesa_program.Base.Parameters->
fp->mesa_program.Base.Parameters->
ParameterValues[factor_index]);
tempreg = keep(get_temp_reg(cs));
@ -1264,10 +1264,10 @@ static int find_and_prepare_slot(struct r300_pfs_compile_state *cs,
return -1;
}
fp->code.alu.inst[pos].inst0 = NOP_INST0;
fp->code.alu.inst[pos].inst1 = NOP_INST1;
fp->code.alu.inst[pos].inst2 = NOP_INST2;
fp->code.alu.inst[pos].inst3 = NOP_INST3;
code->alu.inst[pos].inst0 = NOP_INST0;
code->alu.inst[pos].inst1 = NOP_INST1;
code->alu.inst[pos].inst2 = NOP_INST2;
code->alu.inst[pos].inst3 = NOP_INST3;
cs->nrslots++;
}
@ -1518,24 +1518,6 @@ static void emit_arith(struct r300_pfs_compile_state *cs,
return;
}
#if 0
static GLuint get_attrib(struct r300_fragment_program *fp, GLuint attr)
{
struct gl_fragment_program *mp = &fp->mesa_program;
GLuint r = undef;
if (!(mp->Base.InputsRead & (1 << attr))) {
ERROR("Attribute %d was not provided!\n", attr);
return undef;
}
REG_SET_TYPE(r, REG_TYPE_INPUT);
REG_SET_INDEX(r, attr);
REG_SET_VALID(r, GL_TRUE);
return r;
}
#endif
static GLfloat SinCosConsts[2][4] = {
{
1.273239545, // 4/PI

1
src/mesa/drivers/dri/r300/r300_ioctl.c
View file

@ -54,6 +54,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r300_vertprog.h"
#include "radeon_reg.h"
#include "r300_emit.h"
#include "r300_fragprog.h"
#include "vblank.h"

1
src/mesa/drivers/dri/r300/r300_render.c
View file

@ -74,6 +74,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r300_reg.h"
#include "r300_tex.h"
#include "r300_emit.h"
#include "r300_fragprog.h"
extern int future_hw_tcl_on;
/**

1
src/mesa/drivers/dri/r300/r300_state.c
View file

@ -60,6 +60,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r300_state.h"
#include "r300_reg.h"
#include "r300_emit.h"
#include "r300_fragprog.h"
#include "r300_tex.h"
#include "drirenderbuffer.h"