projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Add support for NV_conditional_render.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
intel
/
intel_pixel_copy.c
diff --git
a/src/mesa/drivers/dri/intel/intel_pixel_copy.c
b/src/mesa/drivers/dri/intel/intel_pixel_copy.c
index a7ca780e944021899142479a5d466662a3efb07d..e83f1bfab949717f819a1bf1236e4f95707bf8a0 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_pixel_copy.c
+++ b/
src/mesa/drivers/dri/intel/intel_pixel_copy.c
@@
-29,6
+29,7
@@
#include "main/image.h"
#include "main/state.h"
#include "main/mtypes.h"
#include "main/image.h"
#include "main/state.h"
#include "main/mtypes.h"
+#include "main/condrender.h"
#include "drivers/common/meta.h"
#include "intel_context.h"
#include "drivers/common/meta.h"
#include "intel_context.h"
@@
-204,6
+205,9
@@
intelCopyPixels(struct gl_context * ctx,
{
DBG("%s\n", __FUNCTION__);
{
DBG("%s\n", __FUNCTION__);
+ if (!_mesa_check_conditional_render(ctx))
+ return;
+
if (do_blit_copypixels(ctx, srcx, srcy, width, height, destx, desty, type))
return;
if (do_blit_copypixels(ctx, srcx, srcy, width, height, destx, desty, type))
return;