Merge branch 'mesa_7_7_branch'

[mesa.git] / src / gallium / state_trackers / egl / egl_surface.c

diff --git a/src/gallium/state_trackers/egl/egl_surface.c b/src/gallium/state_trackers/egl/egl_surface.c
index 35c8b106858cd309fd0babaca8d7b4ce2d35100c..d55aa51b82d98b5d776e698d0376e9862bc49fcc 100644 (file)
--- a/src/gallium/state_trackers/egl/egl_surface.c
+++ b/src/gallium/state_trackers/egl/egl_surface.c
@@ -119,7 +119,6 @@ drm_create_texture(_EGLDisplay *dpy,
        templat.format = PIPE_FORMAT_A8R8G8B8_UNORM;
        templat.width0 = w;
        templat.height0 = h;
-       util_format_get_block(templat.format, &templat.block);
 
        texture = screen->texture_create(dev->screen,
                                         &templat);
@@ -172,9 +171,9 @@ drm_takedown_shown_screen(_EGLDisplay *dpy, struct drm_screen *screen)
        drmModeSetCrtc(
                dev->drmFD,
                screen->crtcID,
-               0, // FD
+               0, /* FD */
                0, 0,
-               NULL, 0, // List of output ids
+               NULL, 0, /* List of output ids */
                NULL);
 
        drmModeRmFB(dev->drmFD, screen->fbID);