diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2003-12-07 23:47:56 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2003-12-07 23:47:56 +0000 |
| commit | 273e52f86fa41564f573c8e84d013f995e01a8f0 (patch) | |
| tree | 28bd792577342a0bb53dfa7bb3cebd21b370fe89 /src/mesa/drivers/dri/r200/r200_context.c | |
| parent | 297807d431aed30d7fff3749eea91bde84f60cfa (diff) | |
sync some more of the r200 driver from the DRI trunk
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index b0a3ca8c35..c08c411e22 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -68,11 +68,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. int R200_DEBUG = (0); #endif + /* R200 configuration */ #include "xmlpool.h" - const char __driConfigOptions[] = DRI_CONF_BEGIN DRI_CONF_SECTION_PERFORMANCE @@ -246,7 +246,7 @@ static const struct dri_debug_control debug_control[] = static int -get_ust_nop( uint64_t * ust ) +get_ust_nop( int64_t * ust ) { *ust = 1; return 0; @@ -264,7 +264,7 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual, r200ContextPtr rmesa; GLcontext *ctx, *shareCtx; int i; - int tcl_mode, fthrottle_mode, preferred_bpt; + int tcl_mode, fthrottle_mode; assert(glVisual); assert(driContextPriv); @@ -299,6 +299,7 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual, /* Parse configuration files */ driParseConfigFiles (&rmesa->optionCache, &screen->optionCache, screen->driScreen->myNum, "r200"); + rmesa->r200Screen = screen; rmesa->sarea = (RADEONSAREAPrivPtr)((GLubyte *)sPriv->pSAREA + screen->sarea_priv_offset); |