diff options
| author | Laura Ekstrand <[email protected]> | 2015-03-02 16:48:59 -0800 |
|---|---|---|
| committer | Fredrik Höglund <[email protected]> | 2015-05-14 15:48:13 +0200 |
| commit | 085c67dc77ab3c00d3f68ba52f8343f8ff0cab53 (patch) | |
| tree | 39f3e55c960530d1788d7e684e008c37aac7c537 /src/mesa/main/fbobject.h | |
| parent | d78c831a147e8af6f6fc1a610f4c2e490e75fad1 (diff) | |
main: Major refactor of get_texture_for_framebuffer.
This splits off the (still) rather large chunk that is
get_texture_for_framebuffer into lots of smaller functions specialized to
service the wide variety of unique needs of *FramebufferTexture* entry points.
The result is much cleaner because, rather than having a pile of branches and
confusing conditions (like the boolean layered), the uniqueness is baked into
the entry points. The entry points know whether or not they are layered or use
a textarget.
[Fredrik: - Mention the value of <textarget> in the error message.
- Rename check_zoffset to check_layer, and zoffset to layer.
The zoffset parameter was renamed to layer in
ARB_framebuffer_object.
- Make layered a GLboolean since the value is visible to the API.
- Remove EXT suffixes in refactored code.
- Whitespace fixes.]
Reviewed-by: Fredrik Höglund <[email protected]>
Signed-off-by: Fredrik Höglund <[email protected]>
Diffstat (limited to 'src/mesa/main/fbobject.h')
| -rw-r--r-- | src/mesa/main/fbobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h index 81159d0efa9..e68762b429e 100644 --- a/src/mesa/main/fbobject.h +++ b/src/mesa/main/fbobject.h @@ -119,7 +119,7 @@ extern void _mesa_framebuffer_texture(struct gl_context *ctx, struct gl_framebuffer *fb, GLenum attachment, struct gl_texture_object *texObj, GLenum textarget, - GLint level, GLuint zoffset, GLboolean layered, + GLint level, GLuint layer, GLboolean layered, const char *caller); @@ -206,7 +206,7 @@ _mesa_FramebufferTexture2D(GLenum target, GLenum attachment, extern void GLAPIENTRY _mesa_FramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, - GLint level, GLint zoffset); + GLint level, GLint layer); extern void GLAPIENTRY _mesa_FramebufferTextureLayer(GLenum target, GLenum attachment, |