These two are: Reviewed-by: Chris Forbes <chr...@ijw.co.nz>
On Wed, Nov 20, 2013 at 8:02 PM, Paul Berry <stereotype...@gmail.com> wrote: > From section 6.1.18 (Renderbuffer Object Queries) of the GL 3.2 spec, > under the heading "If the value of FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE > is TEXTURE, then": > > If pname is FRAMEBUFFER_ATTACHMENT_LAYERED, then params will > contain TRUE if an entire level of a three-dimesional texture, > cube map texture, or one-or two-dimensional array texture is > attached. Otherwise, params will contain FALSE. > > Fixes piglit tests: > - spec/!OpenGL 3.2/layered-rendering/framebuffer-layered-attachments > - spec/!OpenGL 3.2/layered-rendering/framebuffertexture-defaults > > Cc: "10.0" <mesa-sta...@lists.freedesktop.org> > --- > src/mesa/main/fbobject.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c > index 2feb4c3..facd019 100644 > --- a/src/mesa/main/fbobject.c > +++ b/src/mesa/main/fbobject.c > @@ -2950,6 +2950,18 @@ _mesa_GetFramebufferAttachmentParameteriv(GLenum > target, GLenum attachment, > " invalid FBO attachment structure"); > } > return; > + case GL_FRAMEBUFFER_ATTACHMENT_LAYERED: > + if (!_mesa_has_geometry_shaders(ctx)) { > + goto invalid_pname_enum; > + } else if (att->Type == GL_TEXTURE) { > + *params = att->Layered; > + } else if (att->Type == GL_NONE) { > + _mesa_error(ctx, err, > + "glGetFramebufferAttachmentParameterivEXT(pname)"); > + } else { > + goto invalid_pname_enum; > + } > + return; > default: > goto invalid_pname_enum; > } > -- > 1.8.4.2 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev