subject:"\[Mesa\-dev\] \[PATCH\] mesa\: Remove GL_ARB_sampler

[Mesa-dev] [PATCH] mesa: Remove GL_ARB_sampler_object depth compare error checking.

2015-07-30 Thread Stefan Dösinger

Version 3: Simplify the code comment, word wrap commit description.

Version 2: Return GL_FALSE if ARB_shadow is unsupported instead of
pretending to store the value as suggested by Brian Paul.

This fixes a GL error warning on r200 in Wine.

The GL_ARB_sampler_objects extension does not specify a dependency on
GL_ARB_shadow or GL_ARB_depth_texture for setting the depth texture
compare mode and function. Silently ignore attempts to change these
settings. They won't matter without a depth texture being assigned
anyway.
---
 src/mesa/main/samplerobj.c | 28 ++--
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 32180fb1..01cf584 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -634,8 +634,12 @@ static GLuint
 set_sampler_compare_mode(struct gl_context *ctx,
  struct gl_sampler_object *samp, GLint param)
 {
+/* If GL_ARB_shadow is not supported, don't report an error.  The
+ * sampler object extension spec isn't clear on this extension interaction.
+ * Silences errors with Wine on older GPUs such as R200.
+ */
if (!ctx->Extensions.ARB_shadow)
-  return INVALID_PNAME;
+  return GL_FALSE;
 
if (samp->CompareMode == param)
   return GL_FALSE;
@@ -655,8 +659,12 @@ static GLuint
 set_sampler_compare_func(struct gl_context *ctx,
  struct gl_sampler_object *samp, GLint param)
 {
+/* If GL_ARB_shadow is not supported, don't report an error.  The
+ * sampler object extension spec isn't clear on this extension interaction.
+ * Silences errors with Wine on older GPUs such as R200.
+ */
if (!ctx->Extensions.ARB_shadow)
-  return INVALID_PNAME;
+  return GL_FALSE;
 
if (samp->CompareFunc == param)
   return GL_FALSE;
@@ -1342,13 +1350,9 @@ _mesa_GetSamplerParameteriv(GLuint sampler, GLenum 
pname, GLint *params)
   *params = IROUND(sampObj->LodBias);
   break;
case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareMode;
   break;
case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareFunc;
   break;
case GL_TEXTURE_MAX_ANISOTROPY_EXT:
@@ -1431,13 +1435,9 @@ _mesa_GetSamplerParameterfv(GLuint sampler, GLenum 
pname, GLfloat *params)
   *params = sampObj->LodBias;
   break;
case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = (GLfloat) sampObj->CompareMode;
   break;
case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = (GLfloat) sampObj->CompareFunc;
   break;
case GL_TEXTURE_MAX_ANISOTROPY_EXT:
@@ -1510,13 +1510,9 @@ _mesa_GetSamplerParameterIiv(GLuint sampler, GLenum 
pname, GLint *params)
   *params = (GLint) sampObj->LodBias;
   break;
case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareMode;
   break;
case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareFunc;
   break;
case GL_TEXTURE_MAX_ANISOTROPY_EXT:
@@ -1589,13 +1585,9 @@ _mesa_GetSamplerParameterIuiv(GLuint sampler, GLenum 
pname, GLuint *params)
   *params = (GLuint) sampObj->LodBias;
   break;
case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareMode;
   break;
case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareFunc;
   break;
case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-- 
2.3.6

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

[Mesa-dev] [PATCH] mesa: Remove GL_ARB_sampler_object depth compare error checking.

2015-10-05 Thread Stefan Dösinger

Version 3: Simplify the code comment, word wrap commit description.

Version 2: Return GL_FALSE if ARB_shadow is unsupported instead of
pretending to store the value as suggested by Brian Paul.

This fixes a GL error warning on r200 in Wine.

The GL_ARB_sampler_objects extension does not specify a dependency on
GL_ARB_shadow or GL_ARB_depth_texture for setting the depth texture
compare mode and function. Silently ignore attempts to change these
settings. They won't matter without a depth texture being assigned
anyway.
---
 src/mesa/main/samplerobj.c | 28 ++--
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 9bcba60..676dd36 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -621,8 +621,12 @@ static GLuint
 set_sampler_compare_mode(struct gl_context *ctx,
  struct gl_sampler_object *samp, GLint param)
 {
+/* If GL_ARB_shadow is not supported, don't report an error.  The
+ * sampler object extension spec isn't clear on this extension interaction.
+ * Silences errors with Wine on older GPUs such as R200.
+ */
if (!ctx->Extensions.ARB_shadow)
-  return INVALID_PNAME;
+  return GL_FALSE;
 
if (samp->CompareMode == param)
   return GL_FALSE;
@@ -642,8 +646,12 @@ static GLuint
 set_sampler_compare_func(struct gl_context *ctx,
  struct gl_sampler_object *samp, GLint param)
 {
+/* If GL_ARB_shadow is not supported, don't report an error.  The
+ * sampler object extension spec isn't clear on this extension interaction.
+ * Silences errors with Wine on older GPUs such as R200.
+ */
if (!ctx->Extensions.ARB_shadow)
-  return INVALID_PNAME;
+  return GL_FALSE;
 
if (samp->CompareFunc == param)
   return GL_FALSE;
@@ -1329,13 +1337,9 @@ _mesa_GetSamplerParameteriv(GLuint sampler, GLenum 
pname, GLint *params)
   *params = IROUND(sampObj->LodBias);
   break;
case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareMode;
   break;
case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareFunc;
   break;
case GL_TEXTURE_MAX_ANISOTROPY_EXT:
@@ -1418,13 +1422,9 @@ _mesa_GetSamplerParameterfv(GLuint sampler, GLenum 
pname, GLfloat *params)
   *params = sampObj->LodBias;
   break;
case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = (GLfloat) sampObj->CompareMode;
   break;
case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = (GLfloat) sampObj->CompareFunc;
   break;
case GL_TEXTURE_MAX_ANISOTROPY_EXT:
@@ -1497,13 +1497,9 @@ _mesa_GetSamplerParameterIiv(GLuint sampler, GLenum 
pname, GLint *params)
   *params = (GLint) sampObj->LodBias;
   break;
case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareMode;
   break;
case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareFunc;
   break;
case GL_TEXTURE_MAX_ANISOTROPY_EXT:
@@ -1576,13 +1572,9 @@ _mesa_GetSamplerParameterIuiv(GLuint sampler, GLenum 
pname, GLuint *params)
   *params = (GLuint) sampObj->LodBias;
   break;
case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareMode;
   break;
case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
   *params = sampObj->CompareFunc;
   break;
case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-- 
2.4.9

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

Re: [Mesa-dev] [PATCH] mesa: Remove GL_ARB_sampler_object depth compare error checking.

2015-10-06 Thread Brian Paul


Thanks for reposting.  Look OK to me.  I'll commit it later.

Reviewed-by: Brian Paul 


On 10/05/2015 03:36 PM, Stefan Dösinger wrote:

Version 3: Simplify the code comment, word wrap commit description.

Version 2: Return GL_FALSE if ARB_shadow is unsupported instead of
pretending to store the value as suggested by Brian Paul.

This fixes a GL error warning on r200 in Wine.

The GL_ARB_sampler_objects extension does not specify a dependency on
GL_ARB_shadow or GL_ARB_depth_texture for setting the depth texture
compare mode and function. Silently ignore attempts to change these
settings. They won't matter without a depth texture being assigned
anyway.
---
  src/mesa/main/samplerobj.c | 28 ++--
  1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 9bcba60..676dd36 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -621,8 +621,12 @@ static GLuint
  set_sampler_compare_mode(struct gl_context *ctx,
   struct gl_sampler_object *samp, GLint param)
  {
+/* If GL_ARB_shadow is not supported, don't report an error.  The
+ * sampler object extension spec isn't clear on this extension interaction.
+ * Silences errors with Wine on older GPUs such as R200.
+ */
 if (!ctx->Extensions.ARB_shadow)
-  return INVALID_PNAME;
+  return GL_FALSE;

 if (samp->CompareMode == param)
return GL_FALSE;
@@ -642,8 +646,12 @@ static GLuint
  set_sampler_compare_func(struct gl_context *ctx,
   struct gl_sampler_object *samp, GLint param)
  {
+/* If GL_ARB_shadow is not supported, don't report an error.  The
+ * sampler object extension spec isn't clear on this extension interaction.
+ * Silences errors with Wine on older GPUs such as R200.
+ */
 if (!ctx->Extensions.ARB_shadow)
-  return INVALID_PNAME;
+  return GL_FALSE;

 if (samp->CompareFunc == param)
return GL_FALSE;
@@ -1329,13 +1337,9 @@ _mesa_GetSamplerParameteriv(GLuint sampler, GLenum 
pname, GLint *params)
*params = IROUND(sampObj->LodBias);
break;
 case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
*params = sampObj->CompareMode;
break;
 case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
*params = sampObj->CompareFunc;
break;
 case GL_TEXTURE_MAX_ANISOTROPY_EXT:
@@ -1418,13 +1422,9 @@ _mesa_GetSamplerParameterfv(GLuint sampler, GLenum 
pname, GLfloat *params)
*params = sampObj->LodBias;
break;
 case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
*params = (GLfloat) sampObj->CompareMode;
break;
 case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
*params = (GLfloat) sampObj->CompareFunc;
break;
 case GL_TEXTURE_MAX_ANISOTROPY_EXT:
@@ -1497,13 +1497,9 @@ _mesa_GetSamplerParameterIiv(GLuint sampler, GLenum 
pname, GLint *params)
*params = (GLint) sampObj->LodBias;
break;
 case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
*params = sampObj->CompareMode;
break;
 case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
*params = sampObj->CompareFunc;
break;
 case GL_TEXTURE_MAX_ANISOTROPY_EXT:
@@ -1576,13 +1572,9 @@ _mesa_GetSamplerParameterIuiv(GLuint sampler, GLenum 
pname, GLuint *params)
*params = (GLuint) sampObj->LodBias;
break;
 case GL_TEXTURE_COMPARE_MODE:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
*params = sampObj->CompareMode;
break;
 case GL_TEXTURE_COMPARE_FUNC:
-  if (!ctx->Extensions.ARB_shadow)
- goto invalid_pname;
*params = sampObj->CompareFunc;
break;
 case GL_TEXTURE_MAX_ANISOTROPY_EXT:



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

Re: [Mesa-dev] [PATCH] mesa: Remove GL_ARB_sampler_object depth compare error checking.

2015-10-09 Thread Stefan Dösinger

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Am 2015-10-06 um 21:01 schrieb Brian Paul:
> Thanks for reposting.  Look OK to me.  I'll commit it later.
I see it is in. Thanks for taking care of this!

Cheers,
Stefan


-BEGIN PGP SIGNATURE-
Version: GnuPG v2

iQIcBAEBCAAGBQJWGAY+AAoJEN0/YqbEcdMwEmkP/0VgZsmvcug9g/ELhSCFZMJr
QFiEMT4J2mOFmfYfuprTGdA6to7FuUKsR2EC+8KKGH4S6tLuxQk3UV1um9dKCQRW
R6m50lLJRTCB4+BoAqfjiwBD2rgczNycuP8bp5q/947zfSsZGN3UyX8AbvdOLXZc
EBNksGi9sNgVl0PsK/klYpyhAqItFbMez6Vi1fLSYHa1fNuRdhlITvR8B+0HT88j
l/XLsqVL3TyrHwdvug6KsUIS69ykgnkJXcvjP7JfjsQ/We3jtwEHRGF+58xRN5yJ
YLMwMnYJSQ5CcXlfhFDvfF47PL0uzfa+51H2HnWyevNt25hphAjqNaTIs0T7daPN
+WE44G8cByiWNgzUusfNNENaBP8uNTEwlQdNNfJUg21RFtQJsWtwBLXcNmeuTFeC
mYfbVcaqgutiZyZnGYuIZpCw+B07/mUZvc3WxYjf+PPhJGmWRNAnRE7J6gM236xS
vVJZLz4PLFrJoPxH9Ef8+nVv/QEvw2/BYdQ1ssMprsFA0CGbePjpfUHAM4dlzeu0
3fFtS+2g1Qt/tMLCQHyihifhkVCfDcXQHnmB77aT1B+h+5yM4daQVENLhxsXjIZw
fi6z7rRb9lZnazpzZEJ21TvGjgGC44evZVJaqxyn0CEyKSC8dA/UmFDQ4utiTAAR
zpHHB2VSP/K1jpeg/lFJ
=WBfb
-END PGP SIGNATURE-
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] mesa: Remove GL_ARB_sampler_object depth compare error checking.

[Mesa-dev] [PATCH] mesa: Remove GL_ARB_sampler_object depth compare error checking.

Re: [Mesa-dev] [PATCH] mesa: Remove GL_ARB_sampler_object depth compare error checking.

Re: [Mesa-dev] [PATCH] mesa: Remove GL_ARB_sampler_object depth compare error checking.

4 matches

Site Navigation

Mail list logo

Footer information