fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 16:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: move readbuffer tests

Browse source
This commit is contained in:
Brian Paul 2009-09-19 16:27:59 -06:00
parent 883dd9d770
commit dc3839ef3d
3 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/main/colortab.c
View file

@ -543,7 +543,10 @@ _mesa_CopyColorTable(GLenum target, GLenum internalformat,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
/* Select buffer to read from */
if (!ctx->ReadBuffer->_ColorReadBuffer) {
return; /* no readbuffer - OK */
}
ctx->Driver.CopyColorTable( ctx, target, internalformat, x, y, width );
}
@ -556,6 +559,10 @@ _mesa_CopyColorSubTable(GLenum target, GLsizei start,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
if (!ctx->ReadBuffer->_ColorReadBuffer) {
return; /* no readbuffer - OK */
}
ctx->Driver.CopyColorSubTable( ctx, target, start, x, y, width );
}

8
src/mesa/main/convolve.c
View file

@ -482,6 +482,10 @@ _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLi
return;
}
if (!ctx->ReadBuffer->_ColorReadBuffer) {
return; /* no readbuffer - OK */
}
ctx->Driver.CopyConvolutionFilter1D( ctx, target,
internalFormat, x, y, width);
}
@ -514,6 +518,10 @@ _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLi
return;
}
if (!ctx->ReadBuffer->_ColorReadBuffer) {
return; /* no readbuffer - OK */
}
ctx->Driver.CopyConvolutionFilter2D( ctx, target, internalFormat, x, y,
width, height );
}

20
src/mesa/swrast/s_imaging.c
View file

@ -42,11 +42,6 @@ _swrast_CopyColorTable( GLcontext *ctx,
GLchan data[MAX_WIDTH][4];
struct gl_buffer_object *bufferSave;
if (!ctx->ReadBuffer->_ColorReadBuffer) {
/* no readbuffer - OK */
return;
}
if (width > MAX_WIDTH)
width = MAX_WIDTH;
@ -76,11 +71,6 @@ _swrast_CopyColorSubTable( GLcontext *ctx,GLenum target, GLsizei start,
GLchan data[MAX_WIDTH][4];
struct gl_buffer_object *bufferSave;
if (!ctx->ReadBuffer->_ColorReadBuffer) {
/* no readbuffer - OK */
return;
}
if (width > MAX_WIDTH)
width = MAX_WIDTH;
@ -111,11 +101,6 @@ _swrast_CopyConvolutionFilter1D(GLcontext *ctx, GLenum target,
GLchan rgba[MAX_CONVOLUTION_WIDTH][4];
struct gl_buffer_object *bufferSave;
if (!ctx->ReadBuffer->_ColorReadBuffer) {
/* no readbuffer - OK */
return;
}
swrast_render_start(ctx);
/* read the data from framebuffer */
@ -147,11 +132,6 @@ _swrast_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target,
GLint i;
struct gl_buffer_object *bufferSave;
if (!ctx->ReadBuffer->_ColorReadBuffer) {
/* no readbuffer - OK */
return;
}
swrast_render_start(ctx);
/* read pixels from framebuffer */