Re: [Mesa-dev] [PATCH 6/8] android, egl: typo dri2_fallback_pixmap_surface -> dri2_fallback_create_pixmap_surface

2014-06-24 Thread Carl Worth
Emil Velikov  writes:
> Indeed the Chad's eglGetPlatformDisplay work went in with mesa 10.2 so I
> believe that this patch can be dropped. Pardon for that :)

No worries at all, Emil.

Thanks for confirming that.

-Carl

-- 
carl.d.wo...@intel.com


pgpNJeNDAdv6E.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 6/8] android, egl: typo dri2_fallback_pixmap_surface -> dri2_fallback_create_pixmap_surface

2014-06-23 Thread Emil Velikov
On 24/06/14 00:31, Carl Worth wrote:
> Adrian Negreanu  writes:
>> I used commit bc8b07a6 as reference, and only the droid_display_vtbl had 
>> this issue.
> ...
> CC: "10.1 10.2" 
> 
Believe that I'm the one "to blame" for adding the stable tag on the series.

>> -   .create_pixmap_surface = dri2_fallback_pixmap_surface,
>> +   .create_pixmap_surface = dri2_fallback_create_pixmap_surface,
> 
> This patch isn't picking cleanly to the 10.1 branch.
> 
> And the grepping I did in 10.1 didn't find either of these function
> names, (neither dri2_fallback_pixmap_surface nor
> dri2_fallback_create_pixmap_surface).
> 
> Adrian, can you confirm whether this patch is needed for 10.1?
> 
Indeed the Chad's eglGetPlatformDisplay work went in with mesa 10.2 so I
believe that this patch can be dropped. Pardon for that :)

-Emil

> I've picked over all of your other nominated android patches, and I'm a
> little nervous to botch things here, (since I won't be testing an
> android build).
> 
> I have pushed out my cherry-picked changes to the 10.1 branch so that you
> can test them if you would like.
> 
> -Carl
> 
> 
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> 

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


Re: [Mesa-dev] [PATCH 6/8] android, egl: typo dri2_fallback_pixmap_surface -> dri2_fallback_create_pixmap_surface

2014-06-23 Thread Carl Worth
Adrian Negreanu  writes:
> I used commit bc8b07a6 as reference, and only the droid_display_vtbl had this 
> issue.
...
CC: "10.1 10.2" 

> -   .create_pixmap_surface = dri2_fallback_pixmap_surface,
> +   .create_pixmap_surface = dri2_fallback_create_pixmap_surface,

This patch isn't picking cleanly to the 10.1 branch.

And the grepping I did in 10.1 didn't find either of these function
names, (neither dri2_fallback_pixmap_surface nor
dri2_fallback_create_pixmap_surface).

Adrian, can you confirm whether this patch is needed for 10.1?

I've picked over all of your other nominated android patches, and I'm a
little nervous to botch things here, (since I won't be testing an
android build).

I have pushed out my cherry-picked changes to the 10.1 branch so that you
can test them if you would like.

-Carl

-- 
carl.d.wo...@intel.com


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


[Mesa-dev] [PATCH 6/8] android, egl: typo dri2_fallback_pixmap_surface -> dri2_fallback_create_pixmap_surface

2014-06-06 Thread Adrian Negreanu
From: Adrian Negreanu 

I used commit bc8b07a6 as reference, and only the droid_display_vtbl had this 
issue.

This fixes:
src/egl/drivers/dri2/platform_android.c:641:29:
  error: 'dri2_fallback_pixmap_surface' undeclared here (not in a function)

Signed-off-by: Adrian Negreanu 
---
 src/egl/drivers/dri2/platform_android.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/egl/drivers/dri2/platform_android.c 
b/src/egl/drivers/dri2/platform_android.c
index 71948bd..d1f597c 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -638,7 +638,7 @@ droid_log(EGLint level, const char *msg)
 static struct dri2_egl_display_vtbl droid_display_vtbl = {
.authenticate = NULL,
.create_window_surface = droid_create_window_surface,
-   .create_pixmap_surface = dri2_fallback_pixmap_surface,
+   .create_pixmap_surface = dri2_fallback_create_pixmap_surface,
.create_pbuffer_surface = droid_create_pbuffer_surface,
.destroy_surface = droid_destroy_surface,
.create_image = droid_create_image_khr,
-- 
2.0.0.rc4

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