projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/7.8'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r300
/
r300_context.c
diff --git
a/src/mesa/drivers/dri/r300/r300_context.c
b/src/mesa/drivers/dri/r300/r300_context.c
index cfeb5407e914499b4833bd9573ca7a9275a20a01..4dce454c3a757aab7b511ec2d0a4904a2004b662 100644
(file)
--- a/
src/mesa/drivers/dri/r300/r300_context.c
+++ b/
src/mesa/drivers/dri/r300/r300_context.c
@@
-61,6
+61,7
@@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r300_state.h"
#include "r300_tex.h"
#include "r300_emit.h"
#include "r300_state.h"
#include "r300_tex.h"
#include "r300_emit.h"
+#include "r300_render.h"
#include "r300_swtcl.h"
#include "radeon_bocs_wrapper.h"
#include "radeon_buffer_objects.h"
#include "r300_swtcl.h"
#include "radeon_bocs_wrapper.h"
#include "radeon_buffer_objects.h"
@@
-226,6
+227,8
@@
static void r300_fallback(GLcontext *ctx, GLuint bit, GLboolean mode)
r300->radeon.Fallback |= bit;
else
r300->radeon.Fallback &= ~bit;
r300->radeon.Fallback |= bit;
else
r300->radeon.Fallback &= ~bit;
+
+ r300SwitchFallback(ctx, R300_FALLBACK_RADEON_COMMON, mode);
}
static void r300_emit_query_finish(radeonContextPtr radeon)
}
static void r300_emit_query_finish(radeonContextPtr radeon)