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

mesa: call _mesa_valid_to_render() in glDrawPixels, glCopyPixels, glBitmap

Browse source 
This lets us simplify and consolidate some state checking code.

This implements the GL_INVALID_OPERATION check for all drawing commands
required by GL_EXT_texture_integer.
This commit is contained in:
Brian Paul 2010-10-26 18:01:50 -06:00
parent 705978e283
commit ccef2110ed
1 changed files with 15 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/mesa/main/drawpix.c
View file

@ -40,17 +40,6 @@
#if FEATURE_drawpix
/**
* If a fragment program is enabled, check that it's valid.
* \return GL_TRUE if valid, GL_FALSE otherwise
*/
static GLboolean
valid_fragment_program(struct gl_context *ctx)
{
return !(ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled);
}
/*
* Execute glDrawPixels
*/
@ -67,41 +56,21 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
}
/* We're not using the current vertex program, and the driver may install
* it's own.
* its own. Note: this may dirty some state.
*/
_mesa_set_vp_override(ctx, GL_TRUE);
if (ctx->NewState) {
_mesa_update_state(ctx);
}
if (!valid_fragment_program(ctx)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glDrawPixels (invalid fragment program)");
goto end;
/* Note: this call does state validation */
if (!_mesa_valid_to_render(ctx, "glDrawPixels")) {
goto end; /* the error code was recorded */
}
if (_mesa_error_check_format_type(ctx, format, type, GL_TRUE)) {
/* the error was already recorded */
goto end;
}
if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
"glDrawPixels(incomplete framebuffer)" );
goto end;
goto end; /* the error code was recorded */
}
if (!ctx->Current.RasterPosValid) {
goto end; /* no-op, not an error */
}
if (_mesa_is_integer_format(format) &&
!_mesa_is_fragment_shader_active(ctx)) {
/* A fragment shader is required when drawing integer formats */
_mesa_error(ctx, GL_INVALID_OPERATION,
"glDrawPixels(integer format but no fragment shader)");
goto end;
goto end; /* no-op, not an error */
}
if (ctx->RenderMode == GL_RENDER) {
@ -175,22 +144,17 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
}
/* We're not using the current vertex program, and the driver may install
* it's own.
* it's own. Note: this may dirty some state.
*/
_mesa_set_vp_override(ctx, GL_TRUE);
if (ctx->NewState) {
_mesa_update_state(ctx);
/* Note: this call does state validation */
if (!_mesa_valid_to_render(ctx, "glCopyPixels")) {
goto end; /* the error code was recorded */
}
if (!valid_fragment_program(ctx)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glCopyPixels (invalid fragment program)");
goto end;
}
if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT ||
ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
/* Check read buffer's status (draw buffer was already checked) */
if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
"glCopyPixels(incomplete framebuffer)" );
goto end;
@ -251,19 +215,9 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
return; /* do nothing */
}
if (ctx->NewState) {
_mesa_update_state(ctx);
}
if (!valid_fragment_program(ctx)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glBitmap (invalid fragment program)");
return;
}
if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
"glBitmap(incomplete framebuffer)");
/* Note: this call does state validation */
if (!_mesa_valid_to_render(ctx, "glBitmap")) {
/* the error code was recorded */
return;
}