}
+static struct gl_texture_object *
+get_texture_for_framebuffer(struct gl_context *ctx, GLuint texture)
+{
+ if (!texture)
+ return NULL;
+
+ return _mesa_lookup_texture(ctx, texture);
+}
+
+
/**
* Common code called by gl*FramebufferTexture*() to retrieve the correct
* texture object pointer.
* \return true if no errors, false if errors
*/
static bool
-get_texture_for_framebuffer(struct gl_context *ctx, GLuint texture,
- bool layered, const char *caller,
- struct gl_texture_object **texObj)
+get_texture_for_framebuffer_err(struct gl_context *ctx, GLuint texture,
+ bool layered, const char *caller,
+ struct gl_texture_object **texObj)
{
*texObj = NULL; /* This will get returned if texture = 0. */
}
+static void
+framebuffer_texture_with_dims_no_error(GLenum target, GLenum attachment,
+ GLenum textarget, GLuint texture,
+ GLint level, GLint layer)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ /* Get the framebuffer object */
+ struct gl_framebuffer *fb = get_framebuffer_target(ctx, target);
+
+ /* Get the texture object */
+ struct gl_texture_object *texObj =
+ get_texture_for_framebuffer(ctx, texture);
+
+ struct gl_renderbuffer_attachment *att =
+ get_attachment(ctx, fb, attachment, NULL);
+
+ _mesa_framebuffer_texture(ctx, fb, attachment, att, texObj, textarget,
+ level, layer, GL_FALSE);
+}
+
+
static void
framebuffer_texture_with_dims(int dims, GLenum target,
GLenum attachment, GLenum textarget,
}
/* Get the texture object */
- if (!get_texture_for_framebuffer(ctx, texture, false, caller, &texObj))
+ if (!get_texture_for_framebuffer_err(ctx, texture, false, caller, &texObj))
return;
if (texObj) {
}
+void GLAPIENTRY
+_mesa_FramebufferTexture1D_no_error(GLenum target, GLenum attachment,
+ GLenum textarget, GLuint texture,
+ GLint level)
+{
+ framebuffer_texture_with_dims_no_error(target, attachment, textarget,
+ texture, level, 0);
+}
+
+
void GLAPIENTRY
_mesa_FramebufferTexture1D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level)
}
+void GLAPIENTRY
+_mesa_FramebufferTexture2D_no_error(GLenum target, GLenum attachment,
+ GLenum textarget, GLuint texture,
+ GLint level)
+{
+ framebuffer_texture_with_dims_no_error(target, attachment, textarget,
+ texture, level, 0);
+}
+
+
void GLAPIENTRY
_mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level)
}
+void GLAPIENTRY
+_mesa_FramebufferTexture3D_no_error(GLenum target, GLenum attachment,
+ GLenum textarget, GLuint texture,
+ GLint level, GLint layer)
+{
+ framebuffer_texture_with_dims_no_error(target, attachment, textarget,
+ texture, level, layer);
+}
+
+
void GLAPIENTRY
_mesa_FramebufferTexture3D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture,
}
-void GLAPIENTRY
-_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
- GLuint texture, GLint level, GLint layer)
+static ALWAYS_INLINE void
+frame_buffer_texture_layer(GLuint framebuffer, GLenum target,
+ GLenum attachment, GLuint texture,
+ GLint level, GLint layer, const char *func,
+ bool dsa)
{
GET_CURRENT_CONTEXT(ctx);
- struct gl_framebuffer *fb;
- struct gl_texture_object *texObj;
- GLenum textarget = 0;
-
- const char *func = "glFramebufferTextureLayer";
/* Get the framebuffer object */
- fb = get_framebuffer_target(ctx, target);
- if (!fb) {
- _mesa_error(ctx, GL_INVALID_ENUM,
- "glFramebufferTextureLayer(invalid target %s)",
- _mesa_enum_to_string(target));
- return;
+ struct gl_framebuffer *fb;
+ if (dsa) {
+ fb = _mesa_lookup_framebuffer_err(ctx, framebuffer, func);
+ if (!fb)
+ return;
+
+ } else {
+ fb = get_framebuffer_target(ctx, target);
+ if (!fb) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid target %s)",
+ func, _mesa_enum_to_string(target));
+ return;
+ }
}
/* Get the texture object */
- if (!get_texture_for_framebuffer(ctx, texture, false, func, &texObj))
+ struct gl_texture_object *texObj;
+ if (!get_texture_for_framebuffer_err(ctx, texture, false, func, &texObj))
return;
+ GLenum textarget = 0;
if (texObj) {
if (!check_texture_target(ctx, texObj->Target, func))
return;
void GLAPIENTRY
-_mesa_NamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment,
- GLuint texture, GLint level, GLint layer)
+_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
+ GLuint texture, GLint level, GLint layer)
{
- GET_CURRENT_CONTEXT(ctx);
- struct gl_framebuffer *fb;
- struct gl_texture_object *texObj;
- GLenum textarget = 0;
-
- const char *func = "glNamedFramebufferTextureLayer";
-
- /* Get the framebuffer object */
- fb = _mesa_lookup_framebuffer_err(ctx, framebuffer, func);
- if (!fb)
- return;
-
- /* Get the texture object */
- if (!get_texture_for_framebuffer(ctx, texture, false, func, &texObj))
- return;
-
- if (texObj) {
- if (!check_texture_target(ctx, texObj->Target, func))
- return;
-
- if (!check_layer(ctx, texObj->Target, layer, func))
- return;
-
- if (!check_level(ctx, texObj->Target, level, func))
- return;
-
- if (texObj->Target == GL_TEXTURE_CUBE_MAP) {
- assert(layer >= 0 && layer < 6);
- textarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer;
- layer = 0;
- }
- }
+ frame_buffer_texture_layer(0, target, attachment, texture, level, layer,
+ "glFramebufferTextureLayer", false);
+}
- struct gl_renderbuffer_attachment *att =
- _mesa_get_and_validate_attachment(ctx, fb, attachment, func);
- if (!att)
- return;
- _mesa_framebuffer_texture(ctx, fb, attachment, att, texObj, textarget,
- level, layer, GL_FALSE);
+void GLAPIENTRY
+_mesa_NamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment,
+ GLuint texture, GLint level, GLint layer)
+{
+ frame_buffer_texture_layer(framebuffer, 0, attachment, texture, level,
+ layer, "glNamedFramebufferTextureLayer", true);
}
}
/* Get the texture object */
- if (!get_texture_for_framebuffer(ctx, texture, true, func, &texObj))
+ if (!get_texture_for_framebuffer_err(ctx, texture, true, func, &texObj))
return;
if (texObj) {
return;
/* Get the texture object */
- if (!get_texture_for_framebuffer(ctx, texture, true, func, &texObj))
+ if (!get_texture_for_framebuffer_err(ctx, texture, true, func, &texObj))
return;
if (texObj) {
projects / mesa.git / blobdiff