diff options
| author | Rob Clark <robdclark@gmail.com> | 2015-09-01 10:01:42 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2015-09-01 10:01:42 -0400 |
| commit | 34bf9d8566aaf97a0f2adb127836134078abd340 (patch) | |
| tree | 8baf8bcbac2d53676439c0709799a03610d1b231 | |
| parent | 27c863a3d549dbbb98cd31c7518b0204207e29fe (diff) | |
| download | drm_gralloc-34bf9d8566aaf97a0f2adb127836134078abd340.tar.gz | |
Revert "Changed format constants to match what vmwgfx driver expects"
I'm not even sure how this could work.. vmwgfx should expect
pipe_format's for the pipe_transfer, so with this change it should be
converting incorrectly in svga_transform_format(). If this is really
needed, it must be fixed in vmwgfx (since GL would be equally broken
on vmwgfx)
This reverts commit dc21193e3252ba2d6526546ba1d0c02116baf3ee.
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | gralloc_drm_pipe.c | 10 |
2 files changed, 4 insertions, 9 deletions
@@ -83,8 +83,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libgralloc_drm LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -std=c99 - LOCAL_SRC_FILES := \ gralloc_drm.c \ gralloc_drm_kms.c @@ -124,7 +122,6 @@ LOCAL_SRC_FILES += gralloc_drm_pipe.c LOCAL_CFLAGS += -DENABLE_PIPE LOCAL_C_INCLUDES += \ external/mesa/include \ - external/mesa/src \ external/mesa/src/gallium/include \ external/mesa/src/gallium/winsys \ external/mesa/src/gallium/drivers \ diff --git a/gralloc_drm_pipe.c b/gralloc_drm_pipe.c index 64b1e56..477e98f 100644 --- a/gralloc_drm_pipe.c +++ b/gralloc_drm_pipe.c @@ -26,8 +26,6 @@ #include <cutils/log.h> #include <errno.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> @@ -62,19 +60,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: |