Revert "Changed format constants to match what vmwgfx driver expects"

This partially reverts commit dc21193e3252ba2d6526546ba1d0c02116baf3ee.

diff --git a/gralloc_drm_pipe.c b/gralloc_drm_pipe.c
index 79b8f05..7af6fb7 100644 (file)
--- a/gralloc_drm_pipe.c
+++ b/gralloc_drm_pipe.c
@@ -27,8 +27,6 @@
 #include <errno.h>
 #include <dlfcn.h>
 
-#include <svga_types.h>
-#include <svga3d_types.h>
 #include <pipe/p_screen.h>
 #include <pipe/p_context.h>
 #include <state_tracker/drm_driver.h>
@@ -70,19 +68,19 @@ static enum pipe_format get_pipe_format(int format)
 
        switch (format) {
        case HAL_PIXEL_FORMAT_RGBA_8888:
-               fmt = SVGA3D_A8R8G8B8;
+               fmt = PIPE_FORMAT_R8G8B8A8_UNORM;
                break;
        case HAL_PIXEL_FORMAT_RGBX_8888:
-               fmt = SVGA3D_X8R8G8B8;
+               fmt = PIPE_FORMAT_R8G8B8X8_UNORM;
                break;
        case HAL_PIXEL_FORMAT_RGB_888:
                fmt = PIPE_FORMAT_R8G8B8_UNORM;
                break;
        case HAL_PIXEL_FORMAT_RGB_565:
-               fmt = SVGA3D_R5G6B5;
+               fmt = PIPE_FORMAT_B5G6R5_UNORM;
                break;
        case HAL_PIXEL_FORMAT_BGRA_8888:
-               fmt = SVGA3D_A8R8G8B8;
+               fmt = PIPE_FORMAT_B8G8R8A8_UNORM;
                break;
        case HAL_PIXEL_FORMAT_YV12:
        case HAL_PIXEL_FORMAT_DRM_NV12: