Attachment 76472 Details for Bug 57200 – glamoregl: Use xf86ScreenToScrn

[patch] glamoregl: Use xf86ScreenToScrn

0001-glamoregl-Use-xf86ScreenToScrn.patch (text/plain), 3.90 KB, created by Michel Dänzer on 2013-03-13 13:50:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2013-03-13 13:50:46 UTC

Size: 3.90 KB

patch

obsolete

>From c1c7f91c7491ec6ada66f4178e2797090aca7b12 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Wed, 13 Mar 2013 14:47:55 +0100
>Subject: [PATCH] glamoregl: Use xf86ScreenToScrn()
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>
>Signed-off-by: Michel DÃ¤nzer <michel.daenzer@amd.com>
>---
> src/glamor_egl.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/src/glamor_egl.c b/src/glamor_egl.c
>index a248aa2..1d975cd 100644
>--- a/src/glamor_egl.c
>+++ b/src/glamor_egl.c
>@@ -116,7 +116,7 @@ glamor_egl_get_screen_private(ScrnInfoPtr scrn)
> _X_EXPORT void
> glamor_egl_make_current(ScreenPtr screen)
> {
>-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
>+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
> 	struct glamor_egl_screen_private *glamor_egl =
> 	    glamor_egl_get_screen_private(scrn);
> 
>@@ -139,7 +139,7 @@ glamor_egl_make_current(ScreenPtr screen)
> _X_EXPORT void
> glamor_egl_restore_context(ScreenPtr screen)
> {
>-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
>+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
> 	struct glamor_egl_screen_private *glamor_egl =
> 	    glamor_egl_get_screen_private(scrn);
> 
>@@ -221,7 +221,7 @@ glamor_create_texture_from_image(struct glamor_egl_screen_private
> Bool
> glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride)
> {
>-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
>+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
> 	struct glamor_egl_screen_private *glamor_egl;
> 	PixmapPtr	screen_pixmap;
> 
>@@ -245,7 +245,7 @@ glamor_egl_create_textured_screen_ext(ScreenPtr screen,
> 				      int stride,
> 				      PixmapPtr *back_pixmap)
> {
>-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
>+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
> 	struct glamor_egl_screen_private *glamor_egl;
> 
> 	glamor_egl = glamor_egl_get_screen_private(scrn);
>@@ -272,7 +272,7 @@ Bool
> glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
> {
> 	ScreenPtr screen = pixmap->drawable.pScreen;
>-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
>+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
> 	struct glamor_egl_screen_private *glamor_egl;
> 	EGLImageKHR image;
> 	GLuint texture;
>@@ -318,7 +318,7 @@ done:
> static void
> _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
> {
>-	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
>+	ScrnInfoPtr scrn = xf86ScreenToScren(pixmap->drawable.pScreen);
> 	EGLImageKHR image;
> 	struct glamor_egl_screen_private *glamor_egl =
> 	    glamor_egl_get_screen_private(scrn);
>@@ -338,7 +338,7 @@ _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
> _X_EXPORT void
> glamor_egl_exchange_buffers(PixmapPtr front, PixmapPtr back)
> {
>-	ScrnInfoPtr scrn = xf86Screens[front->drawable.pScreen->myNum];
>+	ScrnInfoPtr scrn = xf86ScreenToScren(front->drawable.pScreen);
> 	struct glamor_egl_screen_private *glamor_egl =
> 	    glamor_egl_get_screen_private(scrn);
> 	EGLImageKHR old_front_image;
>@@ -371,7 +371,7 @@ glamor_egl_close_screen(CLOSE_SCREEN_ARGS_DECL)
> 	PixmapPtr screen_pixmap;
> 	EGLImageKHR back_image;
> 
>-	scrn = xf86Screens[screen->myNum];
>+	scrn = xf86ScreenToScrn(screen);
> 	glamor_egl = glamor_egl_get_screen_private(scrn);
> 	screen_pixmap = screen->GetScreenPixmap(screen);
> 
>@@ -417,7 +417,7 @@ glamor_egl_has_extension(struct glamor_egl_screen_private *glamor_egl,
> void
> glamor_egl_screen_init(ScreenPtr screen)
> {
>-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
>+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
> 	struct glamor_egl_screen_private *glamor_egl =
> 	    glamor_egl_get_screen_private(scrn);
> 
>@@ -588,7 +588,7 @@ glamor_gl_dispatch_init(ScreenPtr screen,
> 			struct glamor_gl_dispatch *dispatch,
> 			int gl_version)
> {
>-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
>+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
> 	struct glamor_egl_screen_private *glamor_egl =
> 	    glamor_egl_get_screen_private(scrn);
> 	if (!glamor_gl_dispatch_init_impl
>-- 
>1.8.2.rc3
>

Actions: View | Splinter Review

Attachments on bug 57200: 70163 | 70282 | 70283 | 76394 | 76444 | 76445 | 76459 | 76466 | 76467 | 76472 | 76479 | 76480 | 76482 | 76483 | 76484 | 76487 | 76488 | 76582 | 76589 | 76591 | 76595 | 76682 | 76688 | 76690 | 76712 | 76745 | 76868 | 76869 | 76870 | 76871 | 76876 | 108225 | 108226

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.