fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 14:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

main: Add entry points for glNamedFramebufferTexture[Layer].

Browse source 
Reviewed-by: Fredrik Höglund <fredrik@kde.org>
Signed-off-by: Fredrik Höglund <fredrik@kde.org>
This commit is contained in:
Laura Ekstrand 2015-01-28 13:19:57 -08:00 • committed by Fredrik Höglund
parent a602b21f94
commit d78c831a14
4 changed files with 89 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mapi/glapi/gen/ARB_direct_state_access.xml
View file

@ -166,6 +166,21 @@
<param name="renderbuffer" type="GLuint" />
</function>
<function name="NamedFramebufferTexture" offset="assign">
<param name="framebuffer" type="GLuint" />
<param name="attachment" type="GLenum" />
<param name="texture" type="GLuint" />
<param name="level" type="GLint" />
</function>
<function name="NamedFramebufferTextureLayer" offset="assign">
<param name="framebuffer" type="GLuint" />
<param name="attachment" type="GLenum" />
<param name="texture" type="GLuint" />
<param name="level" type="GLint" />
<param name="layer" type="GLint" />
</function>
<!-- Renderbuffer object functions -->
<function name="CreateRenderbuffers" offset="assign">

64
src/mesa/main/fbobject.c
View file

@ -2995,6 +2995,36 @@ _mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
}
void GLAPIENTRY
_mesa_NamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment,
GLuint texture, GLint level, GLint layer)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_framebuffer *fb;
struct gl_texture_object *texObj;
GLboolean layered = GL_FALSE;
/* Get the framebuffer object */
fb = _mesa_lookup_framebuffer_err(ctx, framebuffer,
"glNamedFramebufferTextureLayer");
if (!fb)
return;
/* Get the texture object */
if (!get_texture_for_framebuffer(ctx, texture, 0, level, layer,
&layered,
"glNamedFramebufferTextureLayer",
&texObj)) {
/* Error already recorded */
return;
}
_mesa_framebuffer_texture(ctx, fb, attachment, texObj, 0, level,
layer, layered,
"glNamedFramebufferTextureLayer");
}
void GLAPIENTRY
_mesa_FramebufferTexture(GLenum target, GLenum attachment,
GLuint texture, GLint level)
@ -3032,6 +3062,40 @@ _mesa_FramebufferTexture(GLenum target, GLenum attachment,
}
void GLAPIENTRY
_mesa_NamedFramebufferTexture(GLuint framebuffer, GLenum attachment,
GLuint texture, GLint level)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_framebuffer *fb;
struct gl_texture_object *texObj;
GLboolean layered = GL_TRUE;
if (!_mesa_has_geometry_shaders(ctx)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"unsupported function (glNamedFramebufferTexture) called");
return;
}
/* Get the framebuffer object */
fb = _mesa_lookup_framebuffer_err(ctx, framebuffer,
"glNamedFramebufferTexture");
if (!fb)
return;
/* Get the texture object */
if (!get_texture_for_framebuffer(ctx, texture, 0, level, 0,
&layered, "glNamedFramebufferTexture",
&texObj)) {
/* Error already recorded */
return;
}
_mesa_framebuffer_texture(ctx, fb, attachment, texObj, 0, level,
0, layered, "glNamedFramebufferTexture");
}
void
_mesa_framebuffer_renderbuffer(struct gl_context *ctx,
struct gl_framebuffer *fb,

8
src/mesa/main/fbobject.h
View file

@ -212,10 +212,18 @@ extern void GLAPIENTRY
_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
GLuint texture, GLint level, GLint layer);
extern void GLAPIENTRY
_mesa_NamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment,
GLuint texture, GLint level, GLint layer);
extern void GLAPIENTRY
_mesa_FramebufferTexture(GLenum target, GLenum attachment,
GLuint texture, GLint level);
extern void GLAPIENTRY
_mesa_NamedFramebufferTexture(GLuint framebuffer, GLenum attachment,
GLuint texture, GLint level);
extern void GLAPIENTRY
_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
GLenum renderbuffertarget,

2
src/mesa/main/tests/dispatch_sanity.cpp
View file

@ -982,6 +982,8 @@ const struct function gl_core_functions_possible[] = {
{ "glGetNamedBufferSubData", 45, -1 },
{ "glCreateFramebuffers", 45, -1 },
{ "glNamedFramebufferRenderbuffer", 45, -1 },
{ "glNamedFramebufferTexture", 45, -1 },
{ "glNamedFramebufferTextureLayer", 45, -1 },
{ "glCreateRenderbuffers", 45, -1 },
{ "glNamedRenderbufferStorage", 45, -1 },
{ "glNamedRenderbufferStorageMultisample", 45, -1 },