meta/generate_mipmap: Don't pollute the sampler object namespace
tl;dr: For many types of GL object, we can *NEVER* use the Gen function. In OpenGL ES (all versions!) and OpenGL compatibility profile, applications don't have to call Gen functions. The GL spec is very clear about how you can mix-and-match generated names and non-generated names: you can use any name you want for a particular object type until you call the Gen function for that object type. Here's the problem scenario: - Application calls a meta function that generates a name. The first Gen will probably return 1. - Application decides to use the same name for an object of the same type without calling Gen. Many demo programs use names 1, 2, 3, etc. without calling Gen. - Application calls the meta function again, and the meta function replaces the data. The application's data is lost, and the app fails. Have fun debugging that. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92363 Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
This commit is contained in:
parent
d6782712a1
commit
b85c5fe526
|
@ -137,11 +137,7 @@ _mesa_meta_glsl_generate_mipmap_cleanup(struct gl_context *ctx,
|
|||
_mesa_DeleteVertexArrays(1, &mipmap->VAO);
|
||||
mipmap->VAO = 0;
|
||||
_mesa_reference_buffer_object(ctx, &mipmap->buf_obj, NULL);
|
||||
|
||||
if (mipmap->samp_obj != NULL) {
|
||||
_mesa_DeleteSamplers(1, &mipmap->samp_obj->Name);
|
||||
mipmap->samp_obj = NULL;
|
||||
}
|
||||
_mesa_reference_sampler_object(ctx, &mipmap->samp_obj, NULL);
|
||||
|
||||
if (mipmap->FBO != 0) {
|
||||
_mesa_DeleteFramebuffers(1, &mipmap->FBO);
|
||||
|
@ -227,12 +223,16 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
|
|||
_mesa_BindTexture(target, texObj->Name);
|
||||
|
||||
if (mipmap->samp_obj == NULL) {
|
||||
GLuint sampler;
|
||||
|
||||
_mesa_GenSamplers(1, &sampler);
|
||||
|
||||
mipmap->samp_obj = _mesa_lookup_samplerobj(ctx, sampler);
|
||||
assert(mipmap->samp_obj != NULL && mipmap->samp_obj->Name == sampler);
|
||||
mipmap->samp_obj = ctx->Driver.NewSamplerObject(ctx, 0xDEADBEEF);
|
||||
if (mipmap->samp_obj == NULL) {
|
||||
/* This is a bit lazy. Flag out of memory, and then don't bother to
|
||||
* clean up. Once out of memory is flagged, the only realistic next
|
||||
* move is to destroy the context. That will trigger all the right
|
||||
* clean up.
|
||||
*/
|
||||
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenerateMipmap");
|
||||
return;
|
||||
}
|
||||
|
||||
_mesa_bind_sampler(ctx, ctx->Texture.CurrentUnit, mipmap->samp_obj);
|
||||
|
||||
|
|
Loading…
Reference in New Issue