summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/fbobject.c
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-05-05 15:39:15 +1000
committerTimothy Arceri <[email protected]>2017-05-11 13:53:39 +1000
commit786b9ad95b7ff4b863b15627f3308e8df271fbf7 (patch)
tree70d0a33c5cd5148aad23e79c74a0875fc2796118 /src/mesa/main/fbobject.c
parent8b00630c4d2a58584896b1a86440ef2c5de38636 (diff)
mesa: remove _mesa_problem() from a few locations
_mesa_problem() is still useful in some places such as is if a backend compile fails, but for the majority of cases we should be able to remove it. OpenGL test suites are becoming very mature, we should place more trust in debug builds picking up missed cases. Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/main/fbobject.c')
-rw-r--r--src/mesa/main/fbobject.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index ef4fecff2ae..a1c5a6f26eb 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -3966,10 +3966,6 @@ get_framebuffer_attachment_parameter(struct gl_context *ctx,
&& !_mesa_is_gles3(ctx)) {
goto invalid_pname_enum;
}
- else if (att->Type == GL_NONE) {
- _mesa_error(ctx, err, "%s(invalid pname %s)", caller,
- _mesa_enum_to_string(pname));
- }
else if (att->Texture) {
const struct gl_texture_image *texImage =
_mesa_select_tex_image(att->Texture, att->Texture->Target,
@@ -3987,7 +3983,9 @@ get_framebuffer_attachment_parameter(struct gl_context *ctx,
att->Renderbuffer->Format);
}
else {
- _mesa_problem(ctx, "%s: invalid FBO attachment structure", caller);
+ assert(att->Type == GL_NONE);
+ _mesa_error(ctx, err, "%s(invalid pname %s)", caller,
+ _mesa_enum_to_string(pname));
}
return;
case GL_FRAMEBUFFER_ATTACHMENT_LAYERED: