Mesa3d: An implementation of the OpenGL API

Kenneth Graunke | 1 Aug 2012 01:13

Re: [PATCH 1/2] mesa: Replace VersionMajor/VersionMinor with a Version field.

On 07/31/2012 03:24 PM, Eric Anholt wrote:
> As we get into supporting GL 3.x core, we come across more and more features
> of the API that depend on the version number as opposed to just the extension
> list.  This will let us more sanely do version checks than "(VersionMajor == 3
> && VersionMinor >= 2) || VersionMajor >= 4".
> ---
> 
> I didn't like any of the macrofying changes I heard, particularly
> because I expect the minor version to never hit 10 (We've had GL minor
> versions up to a maximum of 3/10 so far), and it provides consistency
> with piglit where we're also using major * 10 + minor.
> 
> I did take Brian's suggestion of removing the old fields, though.
> That was a bit more typing, but I think it was good.
> 
>  src/mesa/drivers/dri/intel/intel_screen.c      |    4 +---
>  src/mesa/drivers/dri/nouveau/nouveau_context.c |    4 +---
>  src/mesa/drivers/dri/r200/r200_context.c       |    4 +---
>  src/mesa/drivers/dri/radeon/radeon_context.c   |    4 +---
>  src/mesa/main/enable.c                         |    4 ++--
>  src/mesa/main/fbobject.c                       |    8 +++----
>  src/mesa/main/get.c                            |   13 ++++++++---
>  src/mesa/main/glformats.c                      |    8 +++----
>  src/mesa/main/mtypes.h                         |    4 ++--
>  src/mesa/main/texformat.c                      |    4 ++--
>  src/mesa/main/teximage.c                       |   15 ++++++------
>  src/mesa/main/texparam.c                       |    2 +-
>  src/mesa/main/varray.c                         |    5 ++--
>  src/mesa/main/version.c                        |   29 ++++++++++++------------
>  src/mesa/state_tracker/st_manager.c            |    3 +--

(Continue reading)

Kenneth Graunke | 1 Aug 2012 01:16

Re: [PATCH 2/2] mesa: Expose texture buffer objects when the context is GL 3.1 core.

On 07/31/2012 03:24 PM, Eric Anholt wrote:
> ---
>  src/mesa/main/bufferobj.c |    3 ++-
>  src/mesa/main/get.c       |   16 +++++++++++-----
>  src/mesa/main/teximage.c  |    6 ++++--
>  3 files changed, 17 insertions(+), 8 deletions(-)
> 
> diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
> index 5fdf52e..7216307 100644
> --- a/src/mesa/main/bufferobj.c
> +++ b/src/mesa/main/bufferobj.c
>  <at>  <at>  -89,7 +89,8  <at>  <at>  get_buffer_target(struct gl_context *ctx, GLenum target)
>        break;
>  #endif
>     case GL_TEXTURE_BUFFER:
> -      if (ctx->Extensions.ARB_texture_buffer_object) {
> +      if (ctx->Extensions.ARB_texture_buffer_object ||
> +          (ctx->API == API_OPENGL && ctx->Version >= 31)) {

I think you want API_OPENGL_CORE here.  API_OPENGL is
legacy/compatibility GL.

>           return &ctx->Texture.BufferObject;
>        }
>        break;
> diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> index 7ffa3c1..a1e6879 100644
> --- a/src/mesa/main/get.c
> +++ b/src/mesa/main/get.c
>  <at>  <at>  -284,6 +284,12  <at>  <at>  static const int extra_GLSL_130[] = {

(Continue reading)

Eric Anholt | 1 Aug 2012 03:04

[PATCH 1/3] meta: Implement sensible behavior for BlitFramebuffer with sRGB.

Prior to GL 4.2 spec, there was no guidance on how to implement
BlitFramebuffer for sRGB.  Mesa chose to implement skipping decode and encode,
providing a reasonable behavior for sRGB -> sRGB or RGB -> RGB, but providing
something absurd for mixing and matching the two.

In GL 4.2, some text appeared in the spec saying to skip decode (search for
"no linearization").  The only non-absurd interpretation of that would be to
have no encode (same as Mesa's current implementation), otherwise sRGB -> sRGB
blits wouldn't work.

However, it seems clear that you should be able to blit sRGB to RGB and RGB to
sRGB and get appropriate conversion.  The ARB has been discussing the issue,
and appears to agree.  So, instead implement the same behavior as gallium, and
always do the decode if the texture is sRGB, and do the encode if the
application asked for it.

Breaks piglit fbo-srgb-blit, which was expecting our previous no-conversion
behavior.
---
 src/mesa/drivers/common/meta.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 6846bbc..e35f0c8 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
 <at>  <at>  -1357,7 +1357,6  <at>  <at>  blitframebuffer_texture(struct gl_context *ctx,
          const GLenum wrapSSave = texObj->Sampler.WrapS;
          const GLenum wrapTSave = texObj->Sampler.WrapT;
          const GLenum srgbSave = texObj->Sampler.sRGBDecode;

(Continue reading)

Eric Anholt | 1 Aug 2012 03:04

sRGB BlitFramebuffer fix (l4d2 works!)

This is the rendering fix idr and I came to agreement on.  I'm hoping this
doesn't make wine angry -- they're the only app I expect would have issues
with this, and I think what they want should be controllable by
GL_FRAMEBUFFER_SRGB (so hopefully things just work).

Eric Anholt | 1 Aug 2012 03:04

[PATCH 2/3] i965: Pass the framebuffer to update_renderbuffer_surface().

We're going to want to look at the framebuffer for window system sRGB
handling.
---
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |    5 +++--
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c |    3 ++-
 src/mesa/drivers/dri/intel/intel_context.h        |    4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 099668e..0744cc0 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
 <at>  <at>  -1051,9 +1051,10  <at>  <at>  brw_update_null_renderbuffer_surface(struct brw_context *brw, unsigned int unit)
  */
 static void
 brw_update_renderbuffer_surface(struct brw_context *brw,
-				struct gl_renderbuffer *rb,
+				struct gl_framebuffer *fb,
 				unsigned int unit)
 {
+   struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[unit];
    struct intel_context *intel = &brw->intel;
    struct gl_context *ctx = &intel->ctx;
    struct intel_renderbuffer *irb = intel_renderbuffer(rb);
 <at>  <at>  -1196,7 +1197,7  <at>  <at>  brw_update_renderbuffer_surfaces(struct brw_context *brw)
    if (ctx->DrawBuffer->_NumColorDrawBuffers >= 1) {
       for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
 	 if (intel_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[i])) {
-	    intel->vtbl.update_renderbuffer_surface(brw, ctx->DrawBuffer->_ColorDrawBuffers[i], i);
+	    intel->vtbl.update_renderbuffer_surface(brw, ctx->DrawBuffer, i);

(Continue reading)

Eric Anholt | 1 Aug 2012 03:04

[PATCH 3/3] i965: Flag ARGB8888 renderbuffers as sRGB capable and support it.

Fixes rendering in l4d2, which assumes sRGB capability without asking.  We
could convince the app to ask for sRGB, except that we don't expose visuals
with sRGB currently.  This gives the app the ability to choose sRGB rendering
on the typical visual, without having to coordinate with the layer of software
that's choosing the visual.
---
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |    8 ++++++++
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c |    8 ++++++++
 src/mesa/drivers/dri/intel/intel_screen.c         |   11 ++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 0744cc0..1b1b513 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
 <at>  <at>  -1118,6 +1118,14  <at>  <at>  brw_update_renderbuffer_surface(struct brw_context *brw,
       else
 	 format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
       break;
+
+   case MESA_FORMAT_ARGB8888:
+      if (fb->Visual.sRGBCapable && ctx->Color.sRGBEnabled)
+	 format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM_SRGB;
+      else
+	 format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
+      break;
+
    default:
       format = brw->render_target_format[rb_format];
       if (unlikely(!brw->format_supported_as_render_target[rb_format])) {

(Continue reading)

bugzilla-daemon | 1 Aug 2012 04:42

[Bug 52512] Build failures: glsl_lexer.cc & glsl_parser.cc don't exist

https://bugs.freedesktop.org/show_bug.cgi?id=52512

--- Comment #4 from Darren Salt <bugspam <at> moreofthesa.me.uk> 2012-08-01 02:42:04 UTC ---
More information.

make[5]: *** No rule to make target
`../../../../../src/mesa/libdricore/../../glsl/glsl_lexer.cc', needed by
`glsl_lexer.lo'.  Stop.
make[5]: Leaving directory `/.../mesa/build/dri/src/mesa/libdricore'
[...]
$ find -name glsl_lexer.cc
./build/swx11+glu-static/src/glsl/glsl_lexer.cc
./build/dri/src/glsl/glsl_lexer.cc
./build/swx11+glu/src/glsl/glsl_lexer.cc
$

I'd say that out-of-tree builds are currently broken.

--

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

bugzilla-daemon | 1 Aug 2012 06:51

[Bug 52512] Build failures: glsl_lexer.cc & glsl_parser.cc don't exist

https://bugs.freedesktop.org/show_bug.cgi?id=52512

Matt Turner <mattst88 <at> gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |NOTABUG

--- Comment #5 from Matt Turner <mattst88 <at> gmail.com> 2012-08-01 04:51:12 UTC ---
(In reply to comment #4)
> More information.
> 
> make[5]: *** No rule to make target
> `../../../../../src/mesa/libdricore/../../glsl/glsl_lexer.cc', needed by
> `glsl_lexer.lo'.  Stop.
> make[5]: Leaving directory `/.../mesa/build/dri/src/mesa/libdricore'
> [...]
> $ find -name glsl_lexer.cc
> ./build/swx11+glu-static/src/glsl/glsl_lexer.cc
> ./build/dri/src/glsl/glsl_lexer.cc
> ./build/swx11+glu/src/glsl/glsl_lexer.cc
> $

Run git clean -dfx and forget about it.

> I'd say that out-of-tree builds are currently broken.

As in... has never worked. That's one of the reasons we're doing this whole
automake thing.

(Continue reading)

Kenneth Graunke | 1 Aug 2012 07:25

Re: [PATCH 3/3] i965: Flag ARGB8888 renderbuffers as sRGB capable and support it.

On 07/31/2012 06:04 PM, Eric Anholt wrote:
> Fixes rendering in l4d2, which assumes sRGB capability without asking.  We
> could convince the app to ask for sRGB, except that we don't expose visuals
> with sRGB currently.  This gives the app the ability to choose sRGB rendering
> on the typical visual, without having to coordinate with the layer of software
> that's choosing the visual.
> ---
>  src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |    8 ++++++++
>  src/mesa/drivers/dri/i965/gen7_wm_surface_state.c |    8 ++++++++
>  src/mesa/drivers/dri/intel/intel_screen.c         |   11 ++++++++++-
>  3 files changed, 26 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> index 0744cc0..1b1b513 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>  <at>  <at>  -1118,6 +1118,14  <at>  <at>  brw_update_renderbuffer_surface(struct brw_context *brw,
>        else
>  	 format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
>        break;
> +
> +   case MESA_FORMAT_ARGB8888:
> +      if (fb->Visual.sRGBCapable && ctx->Color.sRGBEnabled)
> +	 format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM_SRGB;
> +      else
> +	 format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
> +      break;
> +
>     default:
>        format = brw->render_target_format[rb_format];

(Continue reading)

Kenneth Graunke | 1 Aug 2012 07:52

Re: [PATCH 1/3] meta: Implement sensible behavior for BlitFramebuffer with sRGB.

On 07/31/2012 06:04 PM, Eric Anholt wrote:
> Prior to GL 4.2 spec, there was no guidance on how to implement
> BlitFramebuffer for sRGB.  Mesa chose to implement skipping decode and encode,
> providing a reasonable behavior for sRGB -> sRGB or RGB -> RGB, but providing
> something absurd for mixing and matching the two.
> 
> In GL 4.2, some text appeared in the spec saying to skip decode (search for
> "no linearization").  The only non-absurd interpretation of that would be to
> have no encode (same as Mesa's current implementation), otherwise sRGB -> sRGB
> blits wouldn't work.
> 
> However, it seems clear that you should be able to blit sRGB to RGB and RGB to
> sRGB and get appropriate conversion.  The ARB has been discussing the issue,
> and appears to agree.  So, instead implement the same behavior as gallium, and
> always do the decode if the texture is sRGB, and do the encode if the
> application asked for it.
> 
> Breaks piglit fbo-srgb-blit, which was expecting our previous no-conversion
> behavior.
> ---
>  src/mesa/drivers/common/meta.c |   14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
> index 6846bbc..e35f0c8 100644
> --- a/src/mesa/drivers/common/meta.c
> +++ b/src/mesa/drivers/common/meta.c
>  <at>  <at>  -1357,7 +1357,6  <at>  <at>  blitframebuffer_texture(struct gl_context *ctx,
>           const GLenum wrapSSave = texObj->Sampler.WrapS;
>           const GLenum wrapTSave = texObj->Sampler.WrapT;

(Continue reading)

Group

gmane.comp.video.mesa3d.devel.

Search Archive

Page

1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 173

Articles in period: 1727

August 2012

Language

Change language

Options

Current view: Threads only / Showing only 20 lines / Not hiding cited text.
Change to All messages, whole messages, or hide cited text.

Post a message
NNTP Newsgroup
Classic Gmane web interface
XML

XML

RSS Feed
List Information

About Gmane

Recent entries

[PATCH 0/7] Beginnings of ARB_shading_language_420pack (25 May 2013)
[PATCH 1/7] mesa: Add infrastructure for ARB_shading_language_420pack. (25 May 2013)
[PATCH] gallium/docs: adds documentation for multi viewport cap (24 May 2013)
intel driver blit rework (24 May 2013)
[PATCH 0/4] V2 Multiple viewports in Gallium (24 May 2013)
radeonsi compute improvements (24 May 2013)
[PATCH 0/7] radeonsi: GLSL 1.30 support (24 May 2013)
[Bug 64959] New: Cannot build against EGL without X11 (24 May 2013)
[PATCH 1/2] st/glx: add null ctx check in glXDestroyContext() (24 May 2013)
[Bug 64952] New: Build failure in egl-static when using llvm-3.3 (24 May 2013)
[PATCH 1/3] st/vdpau: invalidate the handles on destruction (24 May 2013)
[PATCH] glsl linker: Initialize member variable interface_namespace. (24 May 2013)
[Bug 64935] New: [swrast] s_texfetch.c:1335: set_fetch_functions: Asse (24 May 2013)
[Bug 64934] New: [llvmpipe] SIGSEGV src/gallium/state_trackers/glx/xli (24 May 2013)
libclc: vload/vstore initial implementation (24 May 2013)
[PATCH] i965: Mask the cut index based on the index buffer type in 3DS (24 May 2013)
[PATCH 0/4] Multiple viewports in Gallium (23 May 2013)
[RFC 0/2] freedreno: adding adreno a3xx support (23 May 2013)
[PATCH libclc] Add bitselect builtin (23 May 2013)
[Bug 64877] R600: OpenCL Regression since llvm commit b6379de427c009 (23 May 2013)
[Bug 64877] R600: OpenCL Regression since llvm commit b6379de427c009 (23 May 2013)

Archives

1114	May 2013
1749	April 2013
1437	March 2013
1571	February 2013
1774	January 2013
1199	December 2012
1473	November 2012
1274	October 2012
1405	September 2012
1727	August 2012
1447	July 2012
1029	June 2012
1063	May 2012
827	April 2012
889	March 2012
1080	February 2012
1778	January 2012
1376	December 2011
1321	November 2011
1139	October 2011
1286	September 2011
1411	August 2011
888	July 2011
1118	June 2011
710	May 2011
836	April 2011
654	March 2011
415	February 2011
581	January 2011
376	December 2010
494	November 2010
387	October 2010
732	September 2010
985	August 2010
455	July 2010
331	June 2010
484	May 2010
630	April 2010
839	March 2010
629	February 2010
824	January 2010
469	December 2009
290	November 2009
351	October 2009
428	September 2009
580	August 2009
405	July 2009
259	June 2009
273	May 2009
278	April 2009
295	March 2009
280	February 2009
258	January 2009
125	December 2008
183	November 2008
138	October 2008
196	September 2008
195	August 2008
123	July 2008
172	June 2008
152	May 2008
146	April 2008
242	March 2008
197	February 2008
152	January 2008
165	December 2007
142	November 2007
128	October 2007
113	September 2007
187	August 2007
237	July 2007
103	June 2007
227	May 2007
279	April 2007
261	March 2007
117	February 2007
144	January 2007
140	December 2006
179	November 2006
237	October 2006
156	September 2006
175	August 2006
150	July 2006
139	June 2006
154	May 2006
137	April 2006
118	March 2006
150	February 2006
84	January 2006
72	December 2005
149	November 2005
160	October 2005
140	September 2005
198	August 2005
120	July 2005
195	June 2005
135	May 2005
154	April 2005
104	March 2005
137	February 2005
172	January 2005
103	December 2004
69	November 2004
164	October 2004
148	September 2004
130	August 2004
171	July 2004
243	June 2004
357	May 2004
352	April 2004
178	March 2004
140	February 2004
245	January 2004
163	December 2003
137	November 2003
169	October 2003
174	September 2003
48	August 2003
154	July 2003
225	June 2003
148	May 2003
239	April 2003
181	March 2003
4	January 2001

Design

Zawodny | Right Menu | Left Menu

Your Own Design

Paste the URL of your CSS below. Download CSS template