summaryrefslogtreecommitdiff
path: root/src/mesa/main/mtypes.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main/mtypes.h')
-rw-r--r--src/mesa/main/mtypes.h163
1 files changed, 73 insertions, 90 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index fde7e3fab2..dfb3f1255e 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.97 2002/10/21 15:52:34 brianp Exp $ */
+/* $Id: mtypes.h,v 1.98 2003/01/14 04:55:45 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -361,7 +361,7 @@ struct gl_current_attrib {
GLfloat RasterColor[4]; /* Current raster color */
GLfloat RasterSecondaryColor[4]; /* Current rast 2ndary color */
GLuint RasterIndex; /* Current raster index */
- GLfloat RasterTexCoords[MAX_TEXTURE_UNITS][4];/* Current raster texcoords */
+ GLfloat RasterTexCoords[MAX_TEXTURE_COORD_UNITS][4];
GLboolean RasterPosValid; /* Raster pos valid flag */
};
@@ -433,8 +433,8 @@ struct gl_enable_attrib {
GLboolean SampleCoverage; /* GL_ARB_multisample */
GLboolean SampleCoverageInvert; /* GL_ARB_multisample */
GLboolean RasterPositionUnclipped; /* GL_IBM_rasterpos_clip */
- GLuint Texture[MAX_TEXTURE_UNITS];
- GLuint TexGen[MAX_TEXTURE_UNITS];
+ GLuint Texture[MAX_TEXTURE_IMAGE_UNITS];
+ GLuint TexGen[MAX_TEXTURE_COORD_UNITS];
GLboolean VertexProgram; /* GL_NV_vertex_program */
GLboolean VertexProgramPointSize; /* GL_NV_vertex_program */
GLboolean VertexProgramTwoSide; /* GL_NV_vertex_program */
@@ -679,7 +679,7 @@ struct gl_point_attrib {
GLfloat Threshold; /* GL_EXT_point_parameters */
GLboolean _Attenuated; /* True if Params != [1, 0, 0] */
GLboolean PointSprite; /* GL_NV_point_sprite */
- GLboolean CoordReplace[MAX_TEXTURE_UNITS]; /* GL_NV_point_sprite */
+ GLboolean CoordReplace[MAX_TEXTURE_COORD_UNITS]; /* GL_NV_point_sprite */
GLenum SpriteRMode; /* GL_NV_point_sprite */
};
@@ -1046,7 +1046,7 @@ struct gl_array_attrib {
struct gl_client_array SecondaryColor;
struct gl_client_array FogCoord;
struct gl_client_array Index;
- struct gl_client_array TexCoord[MAX_TEXTURE_UNITS];
+ struct gl_client_array TexCoord[MAX_TEXTURE_COORD_UNITS];
struct gl_client_array EdgeFlag;
struct gl_client_array VertexAttrib[16]; /* GL_NV_vertex_program */
@@ -1134,125 +1134,103 @@ struct gl_evaluators {
};
-/*
- * Vertex program tokens and datatypes
- */
-
-#define VP_MAX_INSTRUCTIONS 128
-
-#define VP_NUM_INPUT_REGS VERT_ATTRIB_MAX
-#define VP_NUM_OUTPUT_REGS 15
-#define VP_NUM_TEMP_REGS 12
-#define VP_NUM_PROG_REGS 96
-#define VP_NUM_TOTAL_REGISTERS (VP_NUM_INPUT_REGS + VP_NUM_OUTPUT_REGS + VP_NUM_TEMP_REGS + VP_NUM_PROG_REGS)
-
-/* Location of register sets within the whole register file */
-#define VP_INPUT_REG_START 0
-#define VP_INPUT_REG_END (VP_INPUT_REG_START + VP_NUM_INPUT_REGS - 1)
-#define VP_OUTPUT_REG_START (VP_INPUT_REG_END + 1)
-#define VP_OUTPUT_REG_END (VP_OUTPUT_REG_START + VP_NUM_OUTPUT_REGS - 1)
-#define VP_TEMP_REG_START (VP_OUTPUT_REG_END + 1)
-#define VP_TEMP_REG_END (VP_TEMP_REG_START + VP_NUM_TEMP_REGS - 1)
-#define VP_PROG_REG_START (VP_TEMP_REG_END + 1)
-#define VP_PROG_REG_END (VP_PROG_REG_START + VP_NUM_PROG_REGS - 1)
-
-
-/* Machine state (i.e. the register file) */
+/* NV_vertex_program runtime state */
struct vp_machine
{
- GLfloat Registers[VP_NUM_TOTAL_REGISTERS][4];
+ GLfloat Registers[MAX_NV_VERTEX_PROGRAM_TEMPS
+ + MAX_NV_VERTEX_PROGRAM_PARAMS
+ + MAX_NV_VERTEX_PROGRAM_INPUTS
+ + MAX_NV_VERTEX_PROGRAM_OUTPUTS][4];
GLint AddressReg; /* might someday be a 4-vector */
};
-/* Vertex program opcodes */
-enum vp_opcode
+/* NV_fragment_program runtime state */
+struct fp_machine
{
- MOV,
- LIT,
- RCP,
- RSQ,
- EXP,
- LOG,
- MUL,
- ADD,
- DP3,
- DP4,
- DST,
- MIN,
- MAX,
- SLT,
- SGE,
- MAD,
- ARL,
- DPH,
- RCC,
- SUB,
- ABS,
- END
+ GLfloat Registers[MAX_NV_FRAGMENT_PROGRAM_TEMPS
+ + MAX_NV_FRAGMENT_PROGRAM_PARAMS
+ + MAX_NV_FRAGMENT_PROGRAM_INPUTS
+ + MAX_NV_FRAGMENT_PROGRAM_OUTPUTS
+ + MAX_NV_FRAGMENT_PROGRAM_WRITE_ONLYS][4];
+ GLuint CondCodes[4];
};
-/* Instruction source register */
-struct vp_src_register
-{
- GLint Register; /* or the offset from the address register */
- GLuint Swizzle[4];
- GLboolean Negate;
- GLboolean RelAddr;
-};
+/* Vertex and fragment instructions */
+struct vp_instruction;
+struct fp_instruction;
-/* Instruction destination register */
-struct vp_dst_register
+/* Base class for any kind of program object */
+struct program
{
- GLint Register;
- GLboolean WriteMask[4];
+ GLuint Id;
+ GLubyte *String; /* Null-terminated program text */
+ GLenum Target;
+ GLint RefCount;
+ GLboolean Resident;
};
-/* Vertex program instruction */
-struct vp_instruction
+/* Vertex program object */
+struct vertex_program
{
- enum vp_opcode Opcode;
- struct vp_src_register SrcReg[3];
- struct vp_dst_register DstReg;
+ struct program Base; /* base class */
+ struct vp_instruction *Instructions; /* Compiled instructions */
+ GLboolean IsPositionInvariant; /* GL_NV_vertex_program1_1 */
+ GLuint InputsRead; /* Bitmask of which input regs are read */
+ GLuint OutputsWritten; /* Bitmask of which output regs are written to */
};
-/* The actual vertex program, stored in the hash table */
-struct vp_program
+/* Fragment program object */
+struct fragment_program
{
- GLubyte *String; /* Original user code */
- struct vp_instruction *Instructions; /* Compiled instructions */
- GLenum Target; /* GL_VERTEX_PROGRAM_NV or GL_VERTEX_STATE_PROGRAM_NV */
- GLint RefCount; /* Since programs can be shared among contexts */
- GLboolean IsPositionInvariant; /* GL_NV_vertex_program1_1 */
- GLboolean Resident;
+ struct program Base; /* base class */
+ struct fp_instruction *Instructions; /* Compiled instructions */
GLuint InputsRead; /* Bitmask of which input regs are read */
GLuint OutputsWritten; /* Bitmask of which output regs are written to */
+ GLfloat LocalParams[MAX_NV_FRAGMENT_PROGRAM_PARAMS][4];
+};
+
+
+/*
+ * State common to vertex and fragment programs.
+ */
+struct program_state {
+ GLint ErrorPos; /* GL_PROGRAM_ERROR_POSITION_NV */
+ const char *ErrorString; /* GL_PROGRAM_ERROR_STRING_NV */
};
/*
- * State vars for GL_NV_vertex_program
+ * State for GL_NV_vertex_program
*/
struct vertex_program_state
{
GLboolean Enabled; /* GL_VERTEX_PROGRAM_NV */
GLboolean PointSizeEnabled; /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
GLboolean TwoSideEnabled; /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
- GLuint CurrentID; /* currently bound program's ID */
- GLint ErrorPos; /* GL_PROGRAM_ERROR_POSITION_NV */
- struct vp_program *Current; /* ptr to currently bound program */
+ struct vertex_program *Current; /* ptr to currently bound program */
struct vp_machine Machine; /* machine state */
- GLenum TrackMatrix[VP_NUM_PROG_REGS / 4];
- GLenum TrackMatrixTransform[VP_NUM_PROG_REGS / 4];
+ GLenum TrackMatrix[MAX_NV_VERTEX_PROGRAM_PARAMS / 4];
+ GLenum TrackMatrixTransform[MAX_NV_VERTEX_PROGRAM_PARAMS / 4];
};
+/*
+ * State for GL_NV_fragment_program
+ */
+struct fragment_program_state
+{
+ GLboolean Enabled; /* GL_VERTEX_PROGRAM_NV */
+ struct fragment_program *Current; /* ptr to currently bound program */
+ struct fp_machine Machine; /* machine state */
+};
+
/*
* State which can be shared by multiple contexts:
@@ -1271,8 +1249,8 @@ struct gl_shared_state {
struct gl_texture_object *DefaultCubeMap;
struct gl_texture_object *DefaultRect;
- /* GL_NV_vertex_program */
- struct _mesa_HashTable *VertexPrograms;
+ /* GL_NV_vertex/_program */
+ struct _mesa_HashTable *Programs;
void *DriverData; /* Device driver shared state */
};
@@ -1325,6 +1303,8 @@ struct gl_constants {
GLint MaxCubeTextureLevels; /* GL_ARB_texture_cube_map */
GLint MaxTextureRectSize; /* GL_NV_texture_rectangle */
GLuint MaxTextureUnits;
+ GLuint MaxTextureCoordUnits;
+ GLuint MaxTextureImageUnits;
GLfloat MaxTextureMaxAnisotropy; /* GL_EXT_texture_filter_anisotropic */
GLfloat MaxTextureLodBias; /* GL_EXT_texture_lod_bias */
GLuint MaxArrayLockSize;
@@ -1406,6 +1386,7 @@ struct gl_extensions {
GLboolean MESA_resize_buffers;
GLboolean MESA_ycbcr_texture;
GLboolean NV_blend_square;
+ GLboolean NV_fragment_program;
GLboolean NV_point_sprite;
GLboolean NV_texture_rectangle;
GLboolean NV_texgen_reflection;
@@ -1662,7 +1643,7 @@ struct __GLcontextRec {
struct matrix_stack ModelviewMatrixStack;
struct matrix_stack ProjectionMatrixStack;
struct matrix_stack ColorMatrixStack;
- struct matrix_stack TextureMatrixStack[MAX_TEXTURE_UNITS];
+ struct matrix_stack TextureMatrixStack[MAX_TEXTURE_COORD_UNITS];
struct matrix_stack ProgramMatrixStack[MAX_PROGRAM_MATRICES];
struct matrix_stack *CurrentStack; /* Points to one of the above stacks */
@@ -1734,7 +1715,9 @@ struct __GLcontextRec {
struct gl_color_table PostColorMatrixColorTable;
struct gl_color_table ProxyPostColorMatrixColorTable;
- struct vertex_program_state VertexProgram; /* GL_NV_vertex_program */
+ struct program_state Program; /* for vertex or fragment progs */
+ struct vertex_program_state VertexProgram; /* GL_NV_vertex_program */
+ struct fragment_program_state FragmentProgram; /* GL_NV_fragment_program */
GLenum ErrorValue; /* Last error code */
GLenum RenderMode; /* either GL_RENDER, GL_SELECT, GL_FEEDBACK */
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 13:17:10 +0000