From 975b7ef92a74c33bb853b012f377fb098e84fc46 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Wed, 22 Dec 2010 12:27:35 +0800
Subject: [PATCH] st/egl: Remove native_config::samples.

Multisample buffers are never requested.
---
 src/gallium/state_trackers/egl/common/egl_g3d.c  | 4 +---
 src/gallium/state_trackers/egl/common/native.h   | 1 -
 src/gallium/state_trackers/egl/x11/native_dri2.c | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/gallium/state_trackers/egl/common/egl_g3d.c b/src/gallium/state_trackers/egl/common/egl_g3d.c
index 4641dd27617..d71ca866cb7 100644
--- a/src/gallium/state_trackers/egl/common/egl_g3d.c
+++ b/src/gallium/state_trackers/egl/common/egl_g3d.c
@@ -226,8 +226,6 @@ init_config_attributes(_EGLConfig *conf, const struct native_config *nconf,
    }
 
    conf->Level = nconf->level;
-   conf->Samples = nconf->samples;
-   conf->SampleBuffers = 0;
 
    if (nconf->transparent_rgb) {
       conf->TransparentType = EGL_TRANSPARENT_RGB;
@@ -275,7 +273,7 @@ egl_g3d_init_config(_EGLDriver *drv, _EGLDisplay *dpy,
    gconf->stvis.color_format = nconf->color_format;
    gconf->stvis.depth_stencil_format = depth_stencil_format;
    gconf->stvis.accum_format = PIPE_FORMAT_NONE;
-   gconf->stvis.samples = nconf->samples;
+   gconf->stvis.samples = 0;
 
    gconf->stvis.render_buffer = (buffer_mask & ST_ATTACHMENT_BACK_LEFT_MASK) ?
       ST_ATTACHMENT_BACK_LEFT : ST_ATTACHMENT_FRONT_LEFT;
diff --git a/src/gallium/state_trackers/egl/common/native.h b/src/gallium/state_trackers/egl/common/native.h
index 58d844e5cd4..654f445fca6 100644
--- a/src/gallium/state_trackers/egl/common/native.h
+++ b/src/gallium/state_trackers/egl/common/native.h
@@ -126,7 +126,6 @@ struct native_config {
    int native_visual_id;
    int native_visual_type;
    int level;
-   int samples;
    boolean transparent_rgb;
    int transparent_rgb_values[3];
 };
diff --git a/src/gallium/state_trackers/egl/x11/native_dri2.c b/src/gallium/state_trackers/egl/x11/native_dri2.c
index 83892e3f5f5..d60ef2aa396 100644
--- a/src/gallium/state_trackers/egl/x11/native_dri2.c
+++ b/src/gallium/state_trackers/egl/x11/native_dri2.c
@@ -588,7 +588,6 @@ dri2_display_convert_config(struct native_display *ndpy,
    nconf->native_visual_id = mode->visualID;
    nconf->native_visual_type = mode->visualType;
    nconf->level = mode->level;
-   nconf->samples = mode->samples;
 
    if (mode->transparentPixel == GLX_TRANSPARENT_RGB) {
       nconf->transparent_rgb = TRUE;
-- 
2.30.2