-/* $Id: t_vb_program.c,v 1.10 2002/01/22 14:35:17 brianp Exp $ */
+/* $Id: t_vb_program.c,v 1.17 2003/01/14 04:55:47 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.1
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/*
- * -------- Regarding NV_vertex_program --------
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * o Redistribution of the source code must contain a copyright notice
- * and this list of conditions;
- *
- * o Redistribution in binary and source code form must contain the
- * following Notice in the software and any documentation and/or other
- * materials provided with the distribution; and
- *
- * o The name of Nvidia may not be used to promote or endorse software
- * derived from the software.
- *
- * NOTICE: Nvidia hereby grants to each recipient a non-exclusive worldwide
- * royalty free patent license under patent claims that are licensable by
- * Nvidia and which are necessarily required and for which no commercially
- * viable non infringing alternative exists to make, use, sell, offer to sell,
- * import and otherwise transfer the vertex extension for the Mesa 3D Graphics
- * Library as distributed in source code and object code form. No hardware or
- * hardware implementation (including a semiconductor implementation and chips)
- * are licensed hereunder. If a recipient makes a patent claim or institutes
- * patent litigation against Nvidia or Nvidia's customers for use or sale of
- * Nvidia products, then this license grant as to such recipient shall
- * immediately terminate and recipient immediately agrees to cease use and
- * distribution of the Mesa Program and derivatives thereof.
- *
- * THE MESA 3D GRAPHICS LIBRARY IS PROVIDED ON AN "AS IS BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
- * WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-NFRINGEMENT
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * NVIDIA SHALL NOT HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
- * LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE MESA 3D GRAPHICS
- * LIBRARY OR EVIDENCE OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDR, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * If you do not comply with this agreement, then Nvidia may cancel the license
- * and rights granted herein.
- * ---------------------------------------------
- */
/**
* \file tnl/t_vb_program.c
- * \brief Pipeline stage for executing vertex programs
+ * \brief Pipeline stage for executing NVIDIA vertex programs.
* \author Brian Paul, Keith Whitwell
*/
#include "hash.h"
#include "light.h"
#include "macros.h"
-#include "mem.h"
+#include "imports.h"
#include "mmath.h"
#include "simple_list.h"
#include "mtypes.h"
-#include "vpexec.h"
+#include "nvvertprog.h"
+#include "nvvertexec.h"
+#include "nvprogram.h"
#include "math/m_translate.h"
struct vp_stage_data *store = VP_STAGE_DATA(stage);
struct vertex_buffer *VB = &tnl->vb;
struct vp_machine *machine = &(ctx->VertexProgram.Machine);
- struct vp_program *program = ctx->VertexProgram.Current;
- GLint i;
+ struct vertex_program *program = ctx->VertexProgram.Current;
+ GLuint i;
- _mesa_init_tracked_matrices(ctx);
- _mesa_init_vp_registers(ctx); /* init temp and result regs */
- /* XXX if GL_FOG is enabled but the program doesn't write to the
- * o[FOGC] register, set the fog result to 1.0
- */
- /* XXX if GL_VERTEX_PROGRAM_POINT_SIZE_NV is enabled but the program
- * doesn't write the PSIZ variable then use ctx->Point.Size
- */
+ _mesa_init_tracked_matrices(ctx); /* load registers with matrices */
+ _mesa_init_vp_registers(ctx); /* init temp and result regs */
for (i = 0; i < VB->Count; i++) {
GLuint attr;
VB->AttribPtr[2]->data[i][3]);
#endif
- /* XXXX
- * We have to deal with stride!=16 bytes, size!=4, etc in these loops!!!
- */
-
/* load the input attribute registers */
if (VB->Flag) {
/* the traditional glBegin/glVertex/glEnd case */
for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
- if (VB->Flag[i] & (1 << attr)) {
+ if (attr == 0 || (VB->Flag[i] & (1 << attr))) {
COPY_4V(machine->Registers[VP_INPUT_REG_START + attr],
VB->AttribPtr[attr]->data[i]);
}
else {
/* the vertex array case */
for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
- const GLubyte *ptr = (const GLubyte *) VB->AttribPtr[attr]->data;
- const GLint stride = VB->AttribPtr[attr]->stride;
- const GLfloat *data = (GLfloat *) (ptr + stride * i);
- const GLint size = VB->AttribPtr[attr]->size;
- COPY_4V(machine->Registers[VP_INPUT_REG_START + attr], data);
- if (size == 3)
- machine->Registers[VP_INPUT_REG_START + attr][3] = 1.0;
+ if (program->InputsRead & (1 << attr)) {
+ const GLubyte *ptr = (const GLubyte*) VB->AttribPtr[attr]->data;
+ const GLuint stride = VB->AttribPtr[attr]->stride;
+ const GLfloat *data = (GLfloat *) (ptr + stride * i);
+ COPY_4V(machine->Registers[VP_INPUT_REG_START + attr], data);
+ /*ASSERT(VB->AttribPtr[attr]->size == 4);*/
+ ASSERT(stride == 4 * sizeof(GLfloat) || stride == 0);
+ }
}
}
/* execute the program */
ASSERT(program);
- _mesa_exec_program(ctx, program);
+ _mesa_exec_vertex_program(ctx, program);
+
#if 0
printf("Output %d: %f, %f, %f, %f\n", i,
- machine->Registers[VP_OUT_HPOS][0],
- machine->Registers[VP_OUT_HPOS][1],
- machine->Registers[VP_OUT_HPOS][2],
- machine->Registers[VP_OUT_HPOS][3]);
+ machine->Registers[VP_OUTPUT_REG_START + 0][0],
+ machine->Registers[VP_OUTPUT_REG_START + 0][1],
+ machine->Registers[VP_OUTPUT_REG_START + 0][2],
+ machine->Registers[VP_OUTPUT_REG_START + 0][3]);
printf(" color: %f, %f, %f, %f\n",
- machine->Registers[VP_OUT_COL0][0],
- machine->Registers[VP_OUT_COL0][1],
- machine->Registers[VP_OUT_COL0][2],
- machine->Registers[VP_OUT_COL0][3]);
+ machine->Registers[VP_OUTPUT_REG_START +_1][0],
+ machine->Registers[VP_OUTPUT_REG_START + 1][1],
+ machine->Registers[VP_OUTPUT_REG_START + 1][2],
+ machine->Registers[VP_OUTPUT_REG_START + 1][3]);
printf("PointSize[%d]: %g\n", i,
machine->Registers[VP_OUTPUT_REG_START + VERT_RESULT_PSIZ][0]);
#endif
+ /* Fixup fog an point size results if needed */
+ if (ctx->Fog.Enabled &&
+ (program->OutputsWritten & (1 << VERT_RESULT_FOGC)) == 0) {
+ machine->Registers[VP_OUTPUT_REG_START + VERT_RESULT_FOGC][0] = 1.0;
+ }
+
+ if (ctx->VertexProgram.PointSizeEnabled &&
+ (program->OutputsWritten & (1 << VERT_RESULT_PSIZ)) == 0) {
+ machine->Registers[VP_OUTPUT_REG_START + VERT_RESULT_PSIZ][0]
+ = ctx->Point.Size;
+ }
+
/* copy the output registers into the VB->attribs arrays */
/* XXX (optimize) could use a conditional and smaller loop limit here */
for (attr = 0; attr < 15; attr++) {
store->clipmask,
&store->ormask,
&store->andmask );
-
}
else {
VB->NdcPtr = 0;
stage->active = ctx->VertexProgram.Enabled;
if (stage->active) {
- /* XXX what do we need here??? */
- /*
- GLbitfield vpInput = ctx->VertexProgram.Current->InputsRead;
- */
+ /* I believe this is right - Keith?
+ * Set stage->inputs equal to the bitmask of vertex attributes
+ * which the program needs for inputs.
+ */
+
+ stage->inputs = ctx->VertexProgram.Current->InputsRead;
#if 000
if (stage->privatePtr)
projects / mesa.git / blobdiff