projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/gen6: Simplify hiz surface setup
[mesa.git]
/
src
/
mesa
/
tnl
/
t_context.c
diff --git
a/src/mesa/tnl/t_context.c
b/src/mesa/tnl/t_context.c
index f2771cde09566bec0288669246d98f520661a9a0..ec18fa01b2e0d8f12926a052986a34a93b6ec436 100644
(file)
--- a/
src/mesa/tnl/t_context.c
+++ b/
src/mesa/tnl/t_context.c
@@
-1,6
+1,5
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 7.2
*
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
*
@@
-17,12
+16,13
@@
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*
* Authors:
*
* Authors:
- * Keith Whitwell <keith
@tungstengraphics
.com>
+ * Keith Whitwell <keith
w@vmware
.com>
*/
*/
@@
-34,22
+34,25
@@
#include "main/light.h"
#include "math/m_translate.h"
#include "math/m_xform.h"
#include "main/light.h"
#include "math/m_translate.h"
#include "math/m_xform.h"
+#include "main/state.h"
+#include "main/viewport.h"
+#include "util/simple_list.h"
#include "tnl.h"
#include "t_context.h"
#include "t_pipeline.h"
#include "tnl.h"
#include "t_context.h"
#include "t_pipeline.h"
-#include "t_vp_build.h"
#include "vbo/vbo.h"
GLboolean
#include "vbo/vbo.h"
GLboolean
-_tnl_CreateContext(
GL
context *ctx )
+_tnl_CreateContext(
struct gl_
context *ctx )
{
TNLcontext *tnl;
{
TNLcontext *tnl;
+ GLuint i;
/* Create the TNLcontext structure
*/
/* Create the TNLcontext structure
*/
- ctx->swtnl_context = tnl =
(TNLcontext *) CALLOC( sizeof(TNLcontext)
);
+ ctx->swtnl_context = tnl =
calloc(1, sizeof(TNLcontext)
);
if (!tnl) {
return GL_FALSE;
if (!tnl) {
return GL_FALSE;
@@
-68,6
+71,8
@@
_tnl_CreateContext( GLcontext *ctx )
_tnl_install_pipeline( ctx, _tnl_default_pipeline );
}
_tnl_install_pipeline( ctx, _tnl_default_pipeline );
}
+ _math_matrix_ctr(&tnl->_WindowMap);
+
tnl->NeedNdcCoords = GL_TRUE;
tnl->AllowVertexFog = GL_TRUE;
tnl->AllowPixelFog = GL_TRUE;
tnl->NeedNdcCoords = GL_TRUE;
tnl->AllowVertexFog = GL_TRUE;
tnl->AllowPixelFog = GL_TRUE;
@@
-76,12
+81,23
@@
_tnl_CreateContext( GLcontext *ctx )
*/
tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
*/
tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
- tnl->Driver.NotifyMaterialChange = _
mesa_validate_all_lighting
_tables;
+ tnl->Driver.NotifyMaterialChange = _
tnl_validate_shine
_tables;
tnl->nr_blocks = 0;
tnl->nr_blocks = 0;
+ /* Lighting miscellaneous */
+ tnl->_ShineTabList = MALLOC_STRUCT( tnl_shine_tab );
+ make_empty_list( tnl->_ShineTabList );
+ /* Allocate 10 (arbitrary) shininess lookup tables */
+ for (i = 0 ; i < 10 ; i++) {
+ struct tnl_shine_tab *s = MALLOC_STRUCT( tnl_shine_tab );
+ s->shininess = -1;
+ s->refcount = 0;
+ insert_at_tail( tnl->_ShineTabList, s );
+ }
+
/* plug in the VBO drawing function */
/* plug in the VBO drawing function */
- vbo_set_draw_func(ctx, _tnl_
vbo_
draw_prims);
+ vbo_set_draw_func(ctx, _tnl_draw_prims);
_math_init_transformation();
_math_init_translate();
_math_init_transformation();
_math_init_translate();
@@
-91,26
+107,36
@@
_tnl_CreateContext( GLcontext *ctx )
void
void
-_tnl_DestroyContext(
GL
context *ctx )
+_tnl_DestroyContext(
struct gl_
context *ctx )
{
{
+ struct tnl_shine_tab *s, *tmps;
TNLcontext *tnl = TNL_CONTEXT(ctx);
TNLcontext *tnl = TNL_CONTEXT(ctx);
+ _math_matrix_dtr(&tnl->_WindowMap);
+
+ /* Free lighting shininess exponentiation table */
+ foreach_s( s, tmps, tnl->_ShineTabList ) {
+ free( s );
+ }
+ free( tnl->_ShineTabList );
+
_tnl_destroy_pipeline( ctx );
_tnl_destroy_pipeline( ctx );
-
FREE
(tnl);
+
free
(tnl);
ctx->swtnl_context = NULL;
}
void
ctx->swtnl_context = NULL;
}
void
-_tnl_InvalidateState(
GL
context *ctx, GLuint new_state )
+_tnl_InvalidateState(
struct gl_
context *ctx, GLuint new_state )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
- const struct gl_vertex_program *vp = ctx->VertexProgram._Current;
- const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
+ const struct gl_program *vp = ctx->VertexProgram._Current;
+ const struct gl_program *fp = ctx->FragmentProgram._Current;
+ GLuint i;
if (new_state & (_NEW_HINT | _NEW_PROGRAM)) {
if (new_state & (_NEW_HINT | _NEW_PROGRAM)) {
-
ASSERT
(tnl->AllowVertexFog || tnl->AllowPixelFog);
+
assert
(tnl->AllowVertexFog || tnl->AllowPixelFog);
tnl->_DoVertexFog = ((tnl->AllowVertexFog && (ctx->Hint.Fog != GL_NICEST))
|| !tnl->AllowPixelFog) && !fp;
}
tnl->_DoVertexFog = ((tnl->AllowVertexFog && (ctx->Hint.Fog != GL_NICEST))
|| !tnl->AllowPixelFog) && !fp;
}
@@
-120,68
+146,61
@@
_tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
/* Calculate tnl->render_inputs. This bitmask indicates which vertex
* attributes need to be emitted to the rasterizer.
*/
/* Calculate tnl->render_inputs. This bitmask indicates which vertex
* attributes need to be emitted to the rasterizer.
*/
- if (ctx->Visual.rgbMode) {
- GLuint i;
+ tnl->render_inputs_bitset = BITFIELD64_BIT(_TNL_ATTRIB_POS);
- RENDERINPUTS_ZERO( tnl->render_inputs_bitset );
- RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_POS );
-
- if (!fp || (fp->Base.InputsRead & FRAG_BIT_COL0)) {
- RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR0 );
- }
+ if (!fp || (fp->info.inputs_read & VARYING_BIT_COL0)) {
+ tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_COLOR0);
+ }
-
if (NEED_SECONDARY_COLOR
(ctx))
-
RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR1
);
+
if (_mesa_need_secondary_color
(ctx))
+
tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_COLOR1
);
- for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
- if (ctx->Texture._EnabledCoordUnits & (1 << i) ||
- (fp && fp->Base.InputsRead & FRAG_BIT_TEX(i))) {
- RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_TEX(i) );
- }
- }
- }
- else {
- RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_POS );
- RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR_INDEX );
+ for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
+ if (ctx->Texture._EnabledCoordUnits & (1 << i) ||
+ (fp && fp->info.inputs_read & VARYING_BIT_TEX(i))) {
+ tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_TEX(i));
+ }
}
}
- if (ctx->Fog.Enabled) {
- /* fixed-function fog */
- RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );
- }
- else if (fp) {
- if (fp->FogOption != GL_NONE || (fp->Base.InputsRead & FRAG_BIT_FOGC)) {
- /* fragment program needs fog coord */
- RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );
- }
+ if (ctx->Fog.Enabled
+ || (fp != NULL && (fp->info.inputs_read & VARYING_BIT_FOGC) != 0)) {
+ /* Either fixed-function fog or a fragment program needs fog coord.
+ */
+ tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_FOG);
}
if (ctx->Polygon.FrontMode != GL_FILL ||
ctx->Polygon.BackMode != GL_FILL)
}
if (ctx->Polygon.FrontMode != GL_FILL ||
ctx->Polygon.BackMode != GL_FILL)
-
RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_EDGEFLAG
);
+
tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_EDGEFLAG
);
if (ctx->RenderMode == GL_FEEDBACK)
if (ctx->RenderMode == GL_FEEDBACK)
-
RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_TEX0
);
+
tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_TEX0
);
- if (ctx->Point._Attenuated ||
- (ctx->VertexProgram._Enabled && ctx->VertexProgram.PointSizeEnabled))
- RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_POINTSIZE );
+ if (ctx->Point._Attenuated || ctx->VertexProgram.PointSizeEnabled)
+ tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_POINTSIZE);
/* check for varying vars which are written by the vertex program */
if (vp) {
GLuint i;
for (i = 0; i < MAX_VARYING; i++) {
/* check for varying vars which are written by the vertex program */
if (vp) {
GLuint i;
for (i = 0; i < MAX_VARYING; i++) {
- if (vp->Base.OutputsWritten & (1 << (VERT_RESULT_VAR0 + i))) {
- RENDERINPUTS_SET(tnl->render_inputs_bitset,
-
_TNL_ATTRIB_GENERIC(i));
+ if (vp->info.outputs_written &
+ BITFIELD64_BIT(VARYING_SLOT_VAR0 + i)) {
+
tnl->render_inputs_bitset |= BITFIELD64_BIT(
_TNL_ATTRIB_GENERIC(i));
}
}
}
}
}
}
+
+ if (new_state & (_NEW_VIEWPORT | _NEW_BUFFERS)) {
+ float scale[3], translate[3];
+ _mesa_get_viewport_xform(ctx, 0, scale, translate);
+ _math_matrix_viewport(&tnl->_WindowMap, scale, translate,
+ ctx->DrawBuffer->_DepthMaxF);
+ }
}
void
}
void
-_tnl_wakeup(
GL
context *ctx )
+_tnl_wakeup(
struct gl_
context *ctx )
{
/* Assume we haven't been getting state updates either:
*/
{
/* Assume we haven't been getting state updates either:
*/
@@
-204,14
+223,14
@@
_tnl_wakeup( GLcontext *ctx )
* we should "Divide-by-W". Software renders will want that.
*/
void
* we should "Divide-by-W". Software renders will want that.
*/
void
-_tnl_need_projected_coords(
GL
context *ctx, GLboolean mode )
+_tnl_need_projected_coords(
struct gl_
context *ctx, GLboolean mode )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
tnl->NeedNdcCoords = mode;
}
void
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
tnl->NeedNdcCoords = mode;
}
void
-_tnl_allow_vertex_fog(
GL
context *ctx, GLboolean value )
+_tnl_allow_vertex_fog(
struct gl_
context *ctx, GLboolean value )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
tnl->AllowVertexFog = value;
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
tnl->AllowVertexFog = value;
@@
-221,7
+240,7
@@
_tnl_allow_vertex_fog( GLcontext *ctx, GLboolean value )
}
void
}
void
-_tnl_allow_pixel_fog(
GL
context *ctx, GLboolean value )
+_tnl_allow_pixel_fog(
struct gl_
context *ctx, GLboolean value )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
tnl->AllowPixelFog = value;
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
tnl->AllowPixelFog = value;