All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] dri3, i915, i965: Add __DRI_IMAGE_FOURCC_SARGB8888
@ 2013-11-22  4:12 Keith Packard
  2013-11-22 10:26 ` Daniel Vetter
                   ` (2 more replies)
  0 siblings, 3 replies; 38+ messages in thread
From: Keith Packard @ 2013-11-22  4:12 UTC (permalink / raw)
  To: mesa-dev; +Cc: dri-devel

The __DRIimage createImageFromFds function takes a fourcc code, but there was
no fourcc code that match __DRI_IMAGE_FORMAT_SARGB8. This adds a define for
that format, adds a translation in DRI3 from __DRI_IMAGE_FORMAT_SARGB8 to
__DRI_IMAGE_FOURCC_SARGB8888 and then adds translations *back* to
__IMAGE_FORMAT_SARGB8 in both the i915 and i965 drivers.

I'll refrain from comments on whether I think having two separate sets of
format defines in dri_interface.h is a good idea or not...

Signed-off-by: Keith Packard <keithp@keithp.com>
---

This gets iceweasel running with the GL compositor enabled.

 include/GL/internal/dri_interface.h      | 1 +
 src/glx/dri3_glx.c                       | 1 +
 src/mesa/drivers/dri/i915/intel_screen.c | 3 +++
 src/mesa/drivers/dri/i965/intel_screen.c | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index b012570..a4387c4 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -1034,6 +1034,7 @@ struct __DRIdri2ExtensionRec {
 #define __DRI_IMAGE_FOURCC_XRGB8888	0x34325258
 #define __DRI_IMAGE_FOURCC_ABGR8888	0x34324241
 #define __DRI_IMAGE_FOURCC_XBGR8888	0x34324258
+#define __DRI_IMAGE_FOURCC_SARGB8888    0x83324258
 #define __DRI_IMAGE_FOURCC_YUV410	0x39565559
 #define __DRI_IMAGE_FOURCC_YUV411	0x31315559
 #define __DRI_IMAGE_FOURCC_YUV420	0x32315559
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index b047cc8..5861317 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -890,6 +890,7 @@ image_format_to_fourcc(int format)
 
    /* Convert from __DRI_IMAGE_FORMAT to __DRI_IMAGE_FOURCC (sigh) */
    switch (format) {
+   case __DRI_IMAGE_FORMAT_SARGB8: return __DRI_IMAGE_FOURCC_SARGB8888;
    case __DRI_IMAGE_FORMAT_RGB565: return __DRI_IMAGE_FOURCC_RGB565;
    case __DRI_IMAGE_FORMAT_XRGB8888: return __DRI_IMAGE_FOURCC_XRGB8888;
    case __DRI_IMAGE_FORMAT_ARGB8888: return __DRI_IMAGE_FOURCC_ARGB8888;
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 7f1fc6b..2dd2bc7 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -184,6 +184,9 @@ static struct intel_image_format intel_image_formats[] = {
    { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1,
      { { 0, 0, 0, __DRI_IMAGE_FORMAT_ARGB8888, 4 } } },
 
+   { __DRI_IMAGE_FOURCC_SARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1,
+     { { 0, 0, 0, __DRI_IMAGE_FORMAT_SARGB8, 4 } } },
+
    { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_COMPONENTS_RGB, 1,
      { { 0, 0, 0, __DRI_IMAGE_FORMAT_XRGB8888, 4 }, } },
 
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index e44d0f6..cf8c3e2 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -220,6 +220,9 @@ static struct intel_image_format intel_image_formats[] = {
    { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1,
      { { 0, 0, 0, __DRI_IMAGE_FORMAT_ARGB8888, 4 } } },
 
+   { __DRI_IMAGE_FOURCC_SARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1,
+     { { 0, 0, 0, __DRI_IMAGE_FORMAT_SARGB8, 4 } } },
+
    { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_COMPONENTS_RGB, 1,
      { { 0, 0, 0, __DRI_IMAGE_FORMAT_XRGB8888, 4 }, } },
 
-- 
1.8.4.2

^ permalink raw reply related	[flat|nested] 38+ messages in thread

end of thread, other threads:[~2013-12-19 14:03 UTC | newest]

Thread overview: 38+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-22  4:12 [PATCH] dri3, i915, i965: Add __DRI_IMAGE_FOURCC_SARGB8888 Keith Packard
2013-11-22 10:26 ` Daniel Vetter
2013-11-22 11:01   ` [Mesa-dev] " Keith Packard
2013-11-22 16:17     ` Daniel Vetter
2013-11-22 16:17       ` Daniel Vetter
2013-11-22 16:17       ` Daniel Vetter
2013-11-22 17:46       ` Ville Syrjälä
2013-11-22 17:46         ` Ville Syrjälä
2013-11-22 22:12       ` [Intel-gfx] " Kristian Høgsberg
2013-11-22 22:12         ` Kristian Høgsberg
2013-11-22 23:05         ` Ville Syrjälä
2013-11-22 23:05           ` Ville Syrjälä
2013-11-22 23:43           ` Keith Packard
2013-11-22 23:43             ` Keith Packard
2013-11-22 23:43             ` Keith Packard
2013-11-23  1:10             ` Ville Syrjälä
2013-11-23  1:10               ` Ville Syrjälä
2013-11-25 14:57               ` Geert Uytterhoeven
2013-11-25 14:57                 ` Geert Uytterhoeven
2013-11-25 14:57                 ` Geert Uytterhoeven
2013-11-22 23:36         ` [Intel-gfx] " Keith Packard
2013-11-22 23:36           ` Keith Packard
2013-11-22 23:36           ` [Intel-gfx] " Keith Packard
2013-11-25  8:57         ` [Intel-gfx] [Mesa-dev] " Daniel Vetter
2013-11-25  8:57           ` Daniel Vetter
2013-11-25  8:57           ` Daniel Vetter
2013-11-25 14:15           ` [Intel-gfx] " Ville Syrjälä
2013-11-25 14:15             ` Ville Syrjälä
2013-11-25 14:15             ` Ville Syrjälä
     [not found]         ` <16967_1385369810_529310D2_16967_15891_1_20131125085723.GW27344@phenom.ffwll.local>
2013-11-25 15:14           ` i830 watermark problems - status? Thomas Richter
2013-11-25 15:23             ` Daniel Vetter
     [not found]             ` <26487_1385392973_52936B4D_26487_126_1_20131125152331.GB27344@phenom.ffwll.local>
2013-11-25 15:55               ` Thomas Richter
2013-11-25 20:30                 ` Daniel Vetter
     [not found]                 ` <26487_1385411456_5293B380_26487_2367_1_CAKMK7uFFZcf92XbzA9Mj2c0fdhDWZMKkZVNK9yy8Shc8pcLygg@mail.gmail.com>
2013-11-30 20:11                   ` Thomas Richter
2013-12-19 14:01                   ` intel-drm-nightly: hang and black screen on i830 Thomas Richter
2013-11-25 22:08 ` [PATCH] dri3, i915, i965: Add __DRI_IMAGE_FOURCC_SARGB8888 Eric Anholt
2013-12-13 22:58 ` Kenneth Graunke
2013-12-14  0:37   ` [Mesa-dev] " Keith Packard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.