[Mesa-dev] [PATCH] i965: Add support for GL_SKIP_DECODE_EXT on other SRGB formats.
Fixes some failures in getteximage-formats.
---
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 14 ++
1 file changed, 6 insertions(+), 8 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 65ca2fc..9e7fcf1 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -31,6 +31,7 @@
#include "main/mtypes.h"
+#include "main/enums.h"
#include "main/samplerobj.h"
#include "program/prog_parameter.h"
@@ -598,6 +599,11 @@ translate_tex_format(gl_format mesa_format,
GLenum depth_mode,
GLenum srgb_decode)
{
+ if (srgb_decode == GL_SKIP_DECODE_EXT &&
+ _mesa_get_format_color_encoding(mesa_format) == GL_SRGB) {
+ mesa_format = _mesa_get_srgb_format_linear(mesa_format);
+ }
+
switch( mesa_format ) {
case MESA_FORMAT_Z16:
@@ -613,14 +619,6 @@ translate_tex_format(gl_format mesa_format,
case MESA_FORMAT_Z32_FLOAT_X24S8:
return BRW_SURFACEFORMAT_R32G32_FLOAT;
- case MESA_FORMAT_SARGB8:
- case MESA_FORMAT_SLA8:
- case MESA_FORMAT_SL8:
- if (srgb_decode == GL_DECODE_EXT)
-return brw_format_for_mesa_format(mesa_format);
- else if (srgb_decode == GL_SKIP_DECODE_EXT)
-return
brw_format_for_mesa_format(_mesa_get_srgb_format_linear(mesa_format));
-
case MESA_FORMAT_RGBA_FLOAT32:
/* The value of this BRW_SURFACEFORMAT is 0, which tricks the
* assertion below.
--
1.7.10.4
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] i965: Add support for GL_SKIP_DECODE_EXT on other SRGB formats.
On 07/30/2012 01:13 PM, Eric Anholt wrote:
> Fixes some failures in getteximage-formats.
> ---
> src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 14 ++
> 1 file changed, 6 insertions(+), 8 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 65ca2fc..9e7fcf1 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> @@ -31,6 +31,7 @@
>
>
> #include "main/mtypes.h"
> +#include "main/enums.h"
> #include "main/samplerobj.h"
> #include "program/prog_parameter.h"
>
> @@ -598,6 +599,11 @@ translate_tex_format(gl_format mesa_format,
>GLenum depth_mode,
>GLenum srgb_decode)
> {
> + if (srgb_decode == GL_SKIP_DECODE_EXT &&
> + _mesa_get_format_color_encoding(mesa_format) == GL_SRGB) {
> + mesa_format = _mesa_get_srgb_format_linear(mesa_format);
> + }
> +
> switch( mesa_format ) {
>
> case MESA_FORMAT_Z16:
> @@ -613,14 +619,6 @@ translate_tex_format(gl_format mesa_format,
> case MESA_FORMAT_Z32_FLOAT_X24S8:
>return BRW_SURFACEFORMAT_R32G32_FLOAT;
>
> - case MESA_FORMAT_SARGB8:
> - case MESA_FORMAT_SLA8:
> - case MESA_FORMAT_SL8:
> - if (srgb_decode == GL_DECODE_EXT)
> - return brw_format_for_mesa_format(mesa_format);
> - else if (srgb_decode == GL_SKIP_DECODE_EXT)
> - return
> brw_format_for_mesa_format(_mesa_get_srgb_format_linear(mesa_format));
> -
> case MESA_FORMAT_RGBA_FLOAT32:
>/* The value of this BRW_SURFACEFORMAT is 0, which tricks the
> * assertion below.
Yes, please! I also double checked that _mesa_get_srgb_format_linear
actually handles the DXTn formats. It does.
Reviewed-by: Kenneth Graunke
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] i965: Add support for GL_SKIP_DECODE_EXT on other SRGB formats.
On 07/30/2012 02:13 PM, Eric Anholt wrote:
Fixes some failures in getteximage-formats.
---
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 14 ++
1 file changed, 6 insertions(+), 8 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 65ca2fc..9e7fcf1 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -31,6 +31,7 @@
#include "main/mtypes.h"
+#include "main/enums.h"
I don't see why the new code below needs enums.h
#include "main/samplerobj.h"
#include "program/prog_parameter.h"
@@ -598,6 +599,11 @@ translate_tex_format(gl_format mesa_format,
GLenum depth_mode,
GLenum srgb_decode)
{
+ if (srgb_decode == GL_SKIP_DECODE_EXT&&
+ _mesa_get_format_color_encoding(mesa_format) == GL_SRGB) {
+ mesa_format = _mesa_get_srgb_format_linear(mesa_format);
+ }
+
switch( mesa_format ) {
case MESA_FORMAT_Z16:
@@ -613,14 +619,6 @@ translate_tex_format(gl_format mesa_format,
case MESA_FORMAT_Z32_FLOAT_X24S8:
return BRW_SURFACEFORMAT_R32G32_FLOAT;
- case MESA_FORMAT_SARGB8:
- case MESA_FORMAT_SLA8:
- case MESA_FORMAT_SL8:
- if (srgb_decode == GL_DECODE_EXT)
-return brw_format_for_mesa_format(mesa_format);
- else if (srgb_decode == GL_SKIP_DECODE_EXT)
-return
brw_format_for_mesa_format(_mesa_get_srgb_format_linear(mesa_format));
-
case MESA_FORMAT_RGBA_FLOAT32:
/* The value of this BRW_SURFACEFORMAT is 0, which tricks the
* assertion below.
Looks OK otherwise. Reviewed-by: Brian Paul
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] i965: Add support for GL_SKIP_DECODE_EXT on other SRGB formats.
On 07/30/2012 03:28 PM, Brian Paul wrote: > On 07/30/2012 02:13 PM, Eric Anholt wrote: >> Fixes some failures in getteximage-formats. >> --- >> src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 14 ++ >> 1 file changed, 6 insertions(+), 8 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 65ca2fc..9e7fcf1 100644 >> --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c >> +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c >> @@ -31,6 +31,7 @@ >> >> >> #include "main/mtypes.h" >> +#include "main/enums.h" > > I don't see why the new code below needs enums.h Oh...yeah. That was for _mesa_lookup_enum_by_name() during some debugging. Probably should get taken back out. Good eye :) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] i965: Add support for GL_SKIP_DECODE_EXT on other SRGB formats.
Kenneth Graunke writes: > On 07/30/2012 03:28 PM, Brian Paul wrote: >> On 07/30/2012 02:13 PM, Eric Anholt wrote: >>> Fixes some failures in getteximage-formats. >>> --- >>> src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 14 ++ >>> 1 file changed, 6 insertions(+), 8 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 65ca2fc..9e7fcf1 100644 >>> --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c >>> +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c >>> @@ -31,6 +31,7 @@ >>> >>> >>> #include "main/mtypes.h" >>> +#include "main/enums.h" >> >> I don't see why the new code below needs enums.h > > Oh...yeah. That was for _mesa_lookup_enum_by_name() during some > debugging. Probably should get taken back out. Good eye :) Yeah, I *really* wish that _mesa_lookup_enum_by_nr wasn't hidden in enums.h. Also that it had a guessable name that I didn't have to look up each time I'm trying to type it. pgp0oKnza3g0n.pgp Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] i965: Add support for GL_SKIP_DECODE_EXT on other SRGB formats.
On 07/31/2012 09:30 AM, Eric Anholt wrote: Kenneth Graunke writes: On 07/30/2012 03:28 PM, Brian Paul wrote: On 07/30/2012 02:13 PM, Eric Anholt wrote: Fixes some failures in getteximage-formats. --- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 14 ++ 1 file changed, 6 insertions(+), 8 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 65ca2fc..9e7fcf1 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -31,6 +31,7 @@ #include "main/mtypes.h" +#include "main/enums.h" I don't see why the new code below needs enums.h Oh...yeah. That was for _mesa_lookup_enum_by_name() during some debugging. Probably should get taken back out. Good eye :) Yeah, I *really* wish that _mesa_lookup_enum_by_nr wasn't hidden in enums.h. Also that it had a guessable name that I didn't have to look up each time I'm trying to type it. Yeah, feel free to rename it. I'd go with something like _mesa_enum_string(). -Brian ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] i965: Add support for GL_SKIP_DECODE_EXT on other SRGB formats.
Brian Paul writes: > On 07/31/2012 09:30 AM, Eric Anholt wrote: >> Kenneth Graunke writes: >> >>> On 07/30/2012 03:28 PM, Brian Paul wrote: On 07/30/2012 02:13 PM, Eric Anholt wrote: > Fixes some failures in getteximage-formats. > --- >src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 14 ++ >1 file changed, 6 insertions(+), 8 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 65ca2fc..9e7fcf1 100644 > --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > @@ -31,6 +31,7 @@ > > >#include "main/mtypes.h" > +#include "main/enums.h" I don't see why the new code below needs enums.h >>> >>> Oh...yeah. That was for _mesa_lookup_enum_by_name() during some >>> debugging. Probably should get taken back out. Good eye :) >> >> Yeah, I *really* wish that _mesa_lookup_enum_by_nr wasn't hidden in >> enums.h. Also that it had a guessable name that I didn't have to look >> up each time I'm trying to type it. > > Yeah, feel free to rename it. I'd go with something like > _mesa_enum_string(). How about _mesa_get_enum_name()? I also end up typing _mesa_get_format_name() all the time while debugging (and leaving that header include scattered around .c files), so matching those two up would be nice. Also it's pretty close to piglit_get_gl_enum_name(), which we type a lot too. pgpeFOSyGuyoI.pgp Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] i965: Add support for GL_SKIP_DECODE_EXT on other SRGB formats.
On 07/31/2012 12:02 PM, Eric Anholt wrote: Brian Paul writes: On 07/31/2012 09:30 AM, Eric Anholt wrote: Kenneth Graunke writes: On 07/30/2012 03:28 PM, Brian Paul wrote: On 07/30/2012 02:13 PM, Eric Anholt wrote: Fixes some failures in getteximage-formats. --- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 14 ++ 1 file changed, 6 insertions(+), 8 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 65ca2fc..9e7fcf1 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -31,6 +31,7 @@ #include "main/mtypes.h" +#include "main/enums.h" I don't see why the new code below needs enums.h Oh...yeah. That was for _mesa_lookup_enum_by_name() during some debugging. Probably should get taken back out. Good eye :) Yeah, I *really* wish that _mesa_lookup_enum_by_nr wasn't hidden in enums.h. Also that it had a guessable name that I didn't have to look up each time I'm trying to type it. Yeah, feel free to rename it. I'd go with something like _mesa_enum_string(). How about _mesa_get_enum_name()? I also end up typing _mesa_get_format_name() all the time while debugging (and leaving that header include scattered around .c files), so matching those two up would be nice. Also it's pretty close to piglit_get_gl_enum_name(), which we type a lot too. Sounds good. -Brian ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
