projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into pipe-video
[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 56faf076c7e9d26d83cd9bf15486699657f713a6..a7ca780e944021899142479a5d466662a3efb07d 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_pixel_copy.c
+++ b/
src/mesa/drivers/dri/intel/intel_pixel_copy.c
@@
-76,7
+76,7
@@
copypix_src_region(struct intel_context *intel, GLenum type)
* we allow Scissor.
*/
static GLboolean
* we allow Scissor.
*/
static GLboolean
-intel_check_copypixel_blit_fragment_ops(
GL
context * ctx)
+intel_check_copypixel_blit_fragment_ops(
struct gl_
context * ctx)
{
if (ctx->NewState)
_mesa_update_state(ctx);
{
if (ctx->NewState)
_mesa_update_state(ctx);
@@
-102,7
+102,7
@@
intel_check_copypixel_blit_fragment_ops(GLcontext * ctx)
* CopyPixels with the blitter. Don't support zooming, pixel transfer, etc.
*/
static GLboolean
* CopyPixels with the blitter. Don't support zooming, pixel transfer, etc.
*/
static GLboolean
-do_blit_copypixels(
GL
context * ctx,
+do_blit_copypixels(
struct gl_
context * ctx,
GLint srcx, GLint srcy,
GLsizei width, GLsizei height,
GLint dstx, GLint dsty, GLenum type)
GLint srcx, GLint srcy,
GLsizei width, GLsizei height,
GLint dstx, GLint dsty, GLenum type)
@@
-119,8
+119,7
@@
do_blit_copypixels(GLcontext * ctx,
GLboolean flip = GL_FALSE;
if (type == GL_DEPTH || type == GL_STENCIL) {
GLboolean flip = GL_FALSE;
if (type == GL_DEPTH || type == GL_STENCIL) {
- if (INTEL_DEBUG & DEBUG_FALLBACKS)
- fprintf(stderr, "glCopyPixels() fallback: GL_DEPTH || GL_STENCIL\n");
+ fallback_debug("glCopyPixels() fallback: GL_DEPTH || GL_STENCIL\n");
return GL_FALSE;
}
return GL_FALSE;
}
@@
-142,7
+141,7
@@
do_blit_copypixels(GLcontext * ctx,
if (!src || !dst)
return GL_FALSE;
if (!src || !dst)
return GL_FALSE;
- intel
F
lush(&intel->ctx);
+ intel
_f
lush(&intel->ctx);
/* Clip to destination buffer. */
orig_dstx = dstx;
/* Clip to destination buffer. */
orig_dstx = dstx;
@@
-198,13
+197,12
@@
out:
void
void
-intelCopyPixels(
GL
context * ctx,
+intelCopyPixels(
struct gl_
context * ctx,
GLint srcx, GLint srcy,
GLsizei width, GLsizei height,
GLint destx, GLint desty, GLenum type)
{
GLint srcx, GLint srcy,
GLsizei width, GLsizei height,
GLint destx, GLint desty, GLenum type)
{
- if (INTEL_DEBUG & DEBUG_PIXEL)
- fprintf(stderr, "%s\n", __FUNCTION__);
+ DBG("%s\n", __FUNCTION__);
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;