Re: [Mesa-dev] [PATCH] st/nine: Fix multisample limit check

2016-10-17 Thread Emil Velikov
On 16 October 2016 at 23:06, Axel Davy  wrote:
> I've pushed this just now to be sure it makes it for mesa 13.
>
Which reminds me that I should beat up our existing
get-extra-pick-list.sh to track the offending SHA through the branch
and "nominate" the fix. Currently if only checks if the SHA has been
cherry-picked to the branch.

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


Re: [Mesa-dev] [PATCH] st/nine: Fix multisample limit check

2016-10-16 Thread Axel Davy

I've pushed this just now to be sure it makes it for mesa 13.

On 16/10/2016 11:47, Axel Davy wrote:

Fixes regression introduced by
b5603056872708fdd82f1224854097805a01d4c0

The regression prevents some apps to start.

Signed-off-by: Axel Davy 
---
  src/gallium/state_trackers/nine/adapter9.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/nine/adapter9.c 
b/src/gallium/state_trackers/nine/adapter9.c
index eca671a..98b3255 100644
--- a/src/gallium/state_trackers/nine/adapter9.c
+++ b/src/gallium/state_trackers/nine/adapter9.c
@@ -393,7 +393,7 @@ NineAdapter9_CheckDeviceMultiSampleType( struct 
NineAdapter9 *This,
  /* In error cases return only 1 quality level supported */
  *pQualityLevels = 1;
  }
-user_assert(MultiSampleType < D3DMULTISAMPLE_16_SAMPLES, 
D3DERR_INVALIDCALL);
+user_assert(MultiSampleType <= D3DMULTISAMPLE_16_SAMPLES, 
D3DERR_INVALIDCALL);
  
  hr = NineAdapter9_GetScreen(This, DeviceType, );

  if (FAILED(hr))



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


[Mesa-dev] [PATCH] st/nine: Fix multisample limit check

2016-10-16 Thread Axel Davy
Fixes regression introduced by
b5603056872708fdd82f1224854097805a01d4c0

The regression prevents some apps to start.

Signed-off-by: Axel Davy 
---
 src/gallium/state_trackers/nine/adapter9.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/nine/adapter9.c 
b/src/gallium/state_trackers/nine/adapter9.c
index eca671a..98b3255 100644
--- a/src/gallium/state_trackers/nine/adapter9.c
+++ b/src/gallium/state_trackers/nine/adapter9.c
@@ -393,7 +393,7 @@ NineAdapter9_CheckDeviceMultiSampleType( struct 
NineAdapter9 *This,
 /* In error cases return only 1 quality level supported */
 *pQualityLevels = 1;
 }
-user_assert(MultiSampleType < D3DMULTISAMPLE_16_SAMPLES, 
D3DERR_INVALIDCALL);
+user_assert(MultiSampleType <= D3DMULTISAMPLE_16_SAMPLES, 
D3DERR_INVALIDCALL);
 
 hr = NineAdapter9_GetScreen(This, DeviceType, );
 if (FAILED(hr))
-- 
2.10.0

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