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

llvmpipe: don't assert on illegal surface creation.

Browse source 
Since c8eb2d0e82 llvmpipe checks if it's
actually legal to create a surface. The opengl state tracker doesn't quite
obey this so for now just warn instead of assert.
Also warn instead of disabled assert when creating sampler views
(same reasoning).

Addresses https://bugs.freedesktop.org/show_bug.cgi?id=61647.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Roland Scheidegger 2013-03-01 15:32:03 +01:00
parent 4c12276607
commit 2ef13e7c55
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/llvmpipe/lp_state_sampler.c
View file

@ -218,9 +218,8 @@ llvmpipe_create_sampler_view(struct pipe_context *pipe,
* XXX we REALLY want to see the correct bind flag here but the OpenGL
* state tracker can't guarantee that at least for texture buffer objects.
*/
#if 0
assert(texture->bind & PIPE_BIND_SAMPLER_VIEW);
#endif
if (!(texture->bind & PIPE_BIND_SAMPLER_VIEW))
debug_printf("Illegal sampler view creation without bind flag\n");
if (view) {
*view = *templ;

3
src/gallium/drivers/llvmpipe/lp_texture.c
View file

@ -577,7 +577,8 @@ llvmpipe_create_surface(struct pipe_context *pipe,
struct pipe_surface *ps;
assert(surf_tmpl->u.tex.level <= pt->last_level);
assert(pt->bind & (PIPE_BIND_DEPTH_STENCIL | PIPE_BIND_RENDER_TARGET));
if (!(pt->bind & (PIPE_BIND_DEPTH_STENCIL | PIPE_BIND_RENDER_TARGET)))
debug_printf("Illegal surface creation without bind flag\n");
ps = CALLOC_STRUCT(pipe_surface);
if (ps) {