projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r200
/
r200_context.c
diff --git
a/src/mesa/drivers/dri/r200/r200_context.c
b/src/mesa/drivers/dri/r200/r200_context.c
index fc6eb93daa89320560d77be2578da35e9f076491..5a178442bdb7bb2a494a1d3a9e3876a7c624c4ee 100644
(file)
--- a/
src/mesa/drivers/dri/r200/r200_context.c
+++ b/
src/mesa/drivers/dri/r200/r200_context.c
@@
-1,4
+1,3
@@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_context.c,v 1.3 2003/05/06 23:52:08 daenzer Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@
-192,7
+191,6
@@
static const struct tnl_pipeline_stage *r200_pipeline[] = {
&_tnl_texgen_stage,
&_tnl_texture_transform_stage,
&_tnl_point_attenuation_stage,
&_tnl_texgen_stage,
&_tnl_texture_transform_stage,
&_tnl_point_attenuation_stage,
- &_tnl_arb_vertex_program_stage,
&_tnl_vertex_program_stage,
/* Try again to go to tcl?
* - no good for asymmetric-twoside (do with multipass)
&_tnl_vertex_program_stage,
/* Try again to go to tcl?
* - no good for asymmetric-twoside (do with multipass)
@@
-673,12
+671,13
@@
r200MakeCurrent( __DRIcontextPrivate *driContextPriv,
&newCtx->vbl_seq );
}
&newCtx->vbl_seq );
}
+ newCtx->dri.readable = driReadPriv;
+
if ( newCtx->dri.drawable != driDrawPriv ||
if ( newCtx->dri.drawable != driDrawPriv ||
- newCtx->
dri.readable != driReadPriv
) {
+ newCtx->
lastStamp != driDrawPriv->lastStamp
) {
newCtx->dri.drawable = driDrawPriv;
newCtx->dri.drawable = driDrawPriv;
- newCtx->dri.readable = driReadPriv;
- r200
UpdateWindow( newCtx->glCtx
);
+ r200
SetCliprects(newCtx
);
r200UpdateViewportOffset( newCtx->glCtx );
}
r200UpdateViewportOffset( newCtx->glCtx );
}