mesa: Branch 'master' - 4 commits
Keith Packard
keithp at kemper.freedesktop.org
Mon Jan 8 07:02:34 UTC 2007
src/mesa/drivers/dri/i965/brw_context.h | 4 ++--
src/mesa/drivers/dri/i965/brw_metaops.c | 3 +--
src/mesa/drivers/dri/i965/brw_vs_tnl.c | 4 ++--
src/mesa/drivers/dri/i965/brw_wm_state.c | 2 +-
src/mesa/drivers/dri/i965/bufmgr_fake.c | 4 +++-
src/mesa/drivers/dri/i965/intel_context.c | 8 ++++++--
6 files changed, 15 insertions(+), 10 deletions(-)
New commits:
diff-tree d9dd9013a8530bcafcdb2c5fed2b01a22bfca69b (from parents)
Merge: 62db3cc34982d2fec9165633813ef6e656f7d497 026939b00897665f97669bafb1d486a71f90f935
Author: Keith Packard <keithp at neko.keithp.com>
Date: Sun Jan 7 23:00:48 2007 -0800
Merge branch 'origin'
diff-tree 62db3cc34982d2fec9165633813ef6e656f7d497 (from 9311c29558156859c6b26389c1b20a25d361d39d)
Author: Keith Packard <keithp at neko.keithp.com>
Date: Sat Jan 6 17:13:45 2007 -0800
Various warning fixes for i965 driver.
vertex/fragment programs provided as const.
bmSetFenceLock should return bmSetFence value.
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index cac4d86..9ee81b8 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -505,8 +505,8 @@ struct brw_context
/* Active vertex program:
*/
- struct gl_vertex_program *vertex_program;
- struct gl_fragment_program *fragment_program;
+ const struct gl_vertex_program *vertex_program;
+ const struct gl_fragment_program *fragment_program;
/* For populating the gtt:
diff --git a/src/mesa/drivers/dri/i965/brw_metaops.c b/src/mesa/drivers/dri/i965/brw_metaops.c
index 2deec5e..acd1d58 100644
--- a/src/mesa/drivers/dri/i965/brw_metaops.c
+++ b/src/mesa/drivers/dri/i965/brw_metaops.c
@@ -492,8 +492,7 @@ static void meta_draw_quad(struct intel_
}
-static void install_meta_state( struct intel_context *intel,
- GLenum state )
+static void install_meta_state( struct intel_context *intel )
{
GLcontext *ctx = &intel->ctx;
struct brw_context *brw = brw_context(ctx);
diff --git a/src/mesa/drivers/dri/i965/brw_vs_tnl.c b/src/mesa/drivers/dri/i965/brw_vs_tnl.c
index b7893ca..82c1958 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_tnl.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_tnl.c
@@ -114,7 +114,7 @@ static GLuint translate_texgen( GLboolea
static void make_state_key( GLcontext *ctx, struct state_key *key )
{
struct brw_context *brw = brw_context(ctx);
- struct gl_fragment_program *fp = brw->fragment_program;
+ const struct gl_fragment_program *fp = brw->fragment_program;
GLuint i;
/* This now relies on texenvprogram.c being active:
@@ -1628,7 +1628,7 @@ const struct brw_tracked_state brw_tnl_v
static void update_active_vertprog( struct brw_context *brw )
{
- struct gl_vertex_program *prev = brw->vertex_program;
+ const struct gl_vertex_program *prev = brw->vertex_program;
/* NEW_PROGRAM */
if (brw->attribs.VertexProgram->_Enabled) {
diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c
index e41042d..ff5cb31 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_state.c
@@ -122,7 +122,7 @@ static void upload_wm_unit(struct brw_co
/* BRW_NEW_FRAGMENT_PROGRAM */
{
- struct gl_fragment_program *fp = brw->fragment_program;
+ const struct gl_fragment_program *fp = brw->fragment_program;
if (fp->Base.InputsRead & (1<<FRAG_ATTRIB_WPOS))
wm.wm5.program_uses_depth = 1; /* as far as we can tell */
diff --git a/src/mesa/drivers/dri/i965/bufmgr_fake.c b/src/mesa/drivers/dri/i965/bufmgr_fake.c
index 205dc72..24ee11e 100644
--- a/src/mesa/drivers/dri/i965/bufmgr_fake.c
+++ b/src/mesa/drivers/dri/i965/bufmgr_fake.c
@@ -1329,9 +1329,11 @@ unsigned bmSetFence( struct intel_contex
unsigned bmSetFenceLock( struct intel_context *intel )
{
+ unsigned last;
LOCK(intel->bm);
- bmSetFence(intel);
+ last = bmSetFence(intel);
UNLOCK(intel->bm);
+ return last;
}
unsigned bmLockAndFence( struct intel_context *intel )
{
diff-tree 9311c29558156859c6b26389c1b20a25d361d39d (from 8c1cc5fd8084e7a927b15c88709a615fa16b06a3)
Author: Keith Packard <keithp at neko.keithp.com>
Date: Sat Jan 6 17:13:29 2007 -0800
Initialize GL_ARB_occlusion_query only if DRM support is present.
DRM versions before 1.8 do not include the necessary ioctls to support
GL_ARB_occlusion_query, don't enable it on these versions.
diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c
index 9acafe5..459ed10 100644
--- a/src/mesa/drivers/dri/i965/intel_context.c
+++ b/src/mesa/drivers/dri/i965/intel_context.c
@@ -33,6 +33,7 @@
#include "extensions.h"
#include "framebuffer.h"
#include "imports.h"
+#include "points.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
@@ -158,7 +159,6 @@ const struct dri_extension card_extensio
{ "GL_ARB_vertex_buffer_object", GL_ARB_vertex_buffer_object_functions },
{ "GL_ARB_vertex_program", GL_ARB_vertex_program_functions },
{ "GL_ARB_window_pos", GL_ARB_window_pos_functions },
- { "GL_ARB_occlusion_query", GL_ARB_occlusion_query_functions},
{ "GL_EXT_blend_color", GL_EXT_blend_color_functions },
{ "GL_EXT_blend_equation_separate", GL_EXT_blend_equation_separate_functions },
{ "GL_EXT_blend_func_separate", GL_EXT_blend_func_separate_functions },
@@ -184,7 +184,8 @@ const struct dri_extension card_extensio
{ NULL, NULL }
};
-
+static const struct dri_extension arb_oc_extension =
+ { "GL_ARB_occlusion_query", GL_ARB_occlusion_query_functions};
static const struct dri_debug_control debug_control[] =
{
@@ -412,6 +413,9 @@ GLboolean intelInitContext( struct intel
driInitExtensions( ctx, card_extensions,
GL_TRUE );
+ if (intel->intelScreen->drmMinor >= 8)
+ driInitSingleExtension (ctx, &arb_oc_extension);
+
INTEL_DEBUG = driParseDebugString( getenv( "INTEL_DEBUG" ),
debug_control );
diff-tree 8c1cc5fd8084e7a927b15c88709a615fa16b06a3 (from ef02f8be10a9f95788fee48bb9e7801dea0c2ba6)
Author: Haihao Xiang <haihao.xiang at intel.com>
Date: Tue Dec 26 16:45:02 2006 -0800
i965: Support linear format in i965.
Signed-off-by: Keith Packard <keithp at neko.keithp.com>
More information about the mesa-commit
mailing list