X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ftexstate.h;h=52fe60275c23095d273c9aeb2d9a4659062fe1d9;hb=4807a83da0e0f5e3272e85504ee3b2213ef1910a;hp=bee8c9c3316998581238d9a08aee39eb1e6246ee;hpb=6a7ca4ef2cd3f39d3b5e77051cb3f3175e9e60df;p=mesa.git diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h index bee8c9c3316..52fe60275c2 100644 --- a/src/mesa/main/texstate.h +++ b/src/mesa/main/texstate.h @@ -63,24 +63,6 @@ _mesa_max_tex_unit(struct gl_context *ctx) ctx->Const.MaxTextureCoordUnits); } -static inline struct gl_texture_unit * -_mesa_get_tex_unit_err(struct gl_context *ctx, GLuint unit, const char *func) -{ - if (unit < _mesa_max_tex_unit(ctx)) - return _mesa_get_tex_unit(ctx, unit); - - /* Note: This error is a precedent set by glBindTextures. From the GL 4.5 - * specification (30.10.2014) Section 8.1 ("Texture Objects"): - * - * "An INVALID_OPERATION error is generated if first + count is greater - * than the number of texture image units supported by the - * implementation." - */ - _mesa_error(ctx, GL_INVALID_OPERATION, "%s(unit=%s)", func, - _mesa_enum_to_string(GL_TEXTURE0+unit)); - return NULL; -} - extern void _mesa_copy_texture_state( const struct gl_context *src, struct gl_context *dst );