Re: [Mesa-dev] [PATCH 7/7] mesa: Make _mesa_is_stencil_format() consistent with _mesa_is_depth_format().

2011-11-27 Thread Eric Anholt 
On Wed, 23 Nov 2011 13:53:33 -0700, Brian Paul bri...@vmware.com wrote:
 On 11/23/2011 01:37 PM, Eric Anholt wrote:
  There was only one consumer of this API, meta.c, which was intending
  to ask is this format just stencil index (and nothing else)?.
  Instead, if one tried to glDrawPixels of GL_DEPTH_STENCIL-type
  formats, it would just try to draw the stencil parts.  Nothing good
  came of this.
 
  This function looks rather silly at this point, but I'm leaving it in
  place to be the obvious parallel API to _mesa_is_depth_format().  Note
  that if you want the old behavior, you should use it as
  (_mesa_is_stencil_format() || _mesa_is_depthstencil_format()) like is
  commonly done for depth-related tests.
  ---
src/mesa/main/image.c |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
 
  diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
  index 914a999..d91b4ca 100644
  --- a/src/mesa/main/image.c
  +++ b/src/mesa/main/image.c
  @@ -848,7 +848,6 @@ _mesa_is_stencil_format(GLenum format)
{
   switch (format) {
  case GL_STENCIL_INDEX:
  -  case GL_DEPTH_STENCIL:
 return GL_TRUE;
  default:
 return GL_FALSE;
 
 I'd guess/hope this compiles down to:
 
 return format == GL_STENCIL_INDEX;
 
 Either way, Reviewed-by: Brian Paul bri...@vmware.com

Confirmed.  For once, gcc does what we would hope!


pgpQD6YgUh919.pgp
Description: PGP signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 7/7] mesa: Make _mesa_is_stencil_format() consistent with _mesa_is_depth_format().

2011-11-23 Thread Eric Anholt 
There was only one consumer of this API, meta.c, which was intending
to ask is this format just stencil index (and nothing else)?.
Instead, if one tried to glDrawPixels of GL_DEPTH_STENCIL-type
formats, it would just try to draw the stencil parts.  Nothing good
came of this.

This function looks rather silly at this point, but I'm leaving it in
place to be the obvious parallel API to _mesa_is_depth_format().  Note
that if you want the old behavior, you should use it as
(_mesa_is_stencil_format() || _mesa_is_depthstencil_format()) like is
commonly done for depth-related tests.
---
 src/mesa/main/image.c |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 914a999..d91b4ca 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -848,7 +848,6 @@ _mesa_is_stencil_format(GLenum format)
 {
switch (format) {
   case GL_STENCIL_INDEX:
-  case GL_DEPTH_STENCIL:
  return GL_TRUE;
   default:
  return GL_FALSE;
-- 
1.7.7.3

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 7/7] mesa: Make _mesa_is_stencil_format() consistent with _mesa_is_depth_format().

2011-11-23 Thread Brian Paul 

On 11/23/2011 01:37 PM, Eric Anholt wrote:

There was only one consumer of this API, meta.c, which was intending
to ask is this format just stencil index (and nothing else)?.
Instead, if one tried to glDrawPixels of GL_DEPTH_STENCIL-type
formats, it would just try to draw the stencil parts.  Nothing good
came of this.

This function looks rather silly at this point, but I'm leaving it in
place to be the obvious parallel API to _mesa_is_depth_format().  Note
that if you want the old behavior, you should use it as
(_mesa_is_stencil_format() || _mesa_is_depthstencil_format()) like is
commonly done for depth-related tests.
---
  src/mesa/main/image.c |1 -
  1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 914a999..d91b4ca 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -848,7 +848,6 @@ _mesa_is_stencil_format(GLenum format)
  {
 switch (format) {
case GL_STENCIL_INDEX:
-  case GL_DEPTH_STENCIL:
   return GL_TRUE;
default:
   return GL_FALSE;


I'd guess/hope this compiles down to:

   return format == GL_STENCIL_INDEX;

Either way, Reviewed-by: Brian Paul bri...@vmware.com
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev