st/dri: Refactor dri_st_api into other files

5 files changed, 7 insertions, 11 deletions

diff --git a/src/gallium/state_trackers/dri/drm/Makefile b/src/gallium/state_trackers/dri/drm/Makefile
index 7a236da0c0f..d9a973e3c3e 100644
--- a/src/gallium/state_trackers/dri/drm/Makefile
+++ b/src/gallium/state_trackers/dri/drm/Makefile
@@ -16,7 +16,6 @@ C_SOURCES = \
 	dri_context.c \
 	dri_screen.c \
 	dri_drawable.c \
-	dri_st_api.c \
 	dri1_helper.c \
 	dri1.c \
 	dri2.c
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index 1dfaa402f2d..8800b655343 100644
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -20,7 +20,6 @@ if env['dri']:
 	source = [ 'dri_context.c',
 		'dri_drawable.c',
 		'dri_screen.c',
-		'dri_st_api.c',
 		'dri1_helper.c',
 		'dri1.c',
 		'dri2.c',
diff --git a/src/gallium/state_trackers/dri/drm/dri1.c b/src/gallium/state_trackers/dri/drm/dri1.c
index 313195b0967..23c21ed8398 100644
--- a/src/gallium/state_trackers/dri/drm/dri1.c
+++ b/src/gallium/state_trackers/dri/drm/dri1.c
@@ -259,7 +259,7 @@ dri1_flush_frontbuffer(struct dri_drawable *draw,
 {
    struct dri_context *ctx = dri_get_current(draw->sPriv);
    struct dri_screen *screen = dri_screen(draw->sPriv);
-   struct pipe_screen *pipe_screen = screen->pipe_screen;
+   struct pipe_screen *pipe_screen = screen->base.screen;
    struct pipe_fence_handle *dummy_fence;
    struct pipe_resource *ptex;
 
@@ -283,7 +283,7 @@ dri1_swap_buffers(__DRIdrawable * dPriv)
    struct dri_drawable *draw = dri_drawable(dPriv);
    struct dri_context *ctx = dri_get_current(draw->sPriv);
    struct dri_screen *screen = dri_screen(draw->sPriv);
-   struct pipe_screen *pipe_screen = screen->pipe_screen;
+   struct pipe_screen *pipe_screen = screen->base.screen;
    struct pipe_fence_handle *fence;
    struct pipe_resource *ptex;
 
@@ -311,7 +311,7 @@ dri1_copy_sub_buffer(__DRIdrawable * dPriv, int x, int y, int w, int h)
 {
    struct dri_context *ctx = dri_get_current(dPriv->driScreenPriv);
    struct dri_screen *screen = dri_screen(dPriv->driScreenPriv);
-   struct pipe_screen *pipe_screen = screen->pipe_screen;
+   struct pipe_screen *pipe_screen = screen->base.screen;
    struct drm_clip_rect sub_bbox;
    struct dri_drawable *draw = dri_drawable(dPriv);
    struct pipe_fence_handle *dummy_fence;
@@ -389,7 +389,7 @@ dri1_allocate_textures(struct dri_drawable *drawable,
       templ.bind = bind;
 
       drawable->textures[statts[i]] =
-         screen->pipe_screen->resource_create(screen->pipe_screen, &templ);
+         screen->base.screen->resource_create(screen->base.screen, &templ);
    }
 
    drawable->old_w = width;
diff --git a/src/gallium/state_trackers/dri/drm/dri2.c b/src/gallium/state_trackers/dri/drm/dri2.c
index f2d6fc1e5a8..e1216f14c0e 100644
--- a/src/gallium/state_trackers/dri/drm/dri2.c
+++ b/src/gallium/state_trackers/dri/drm/dri2.c
@@ -38,7 +38,6 @@
 #include "dri_screen.h"
 #include "dri_context.h"
 #include "dri_drawable.h"
-#include "dri_st_api.h"
 #include "dri2.h"
 
 #include "GL/internal/dri_interface.h"
@@ -81,7 +80,7 @@ dri2_set_tex_buffer2(__DRIcontext *pDRICtx, GLint target,
    struct dri_drawable *drawable = dri_drawable(dPriv);
    struct pipe_resource *pt;
 
-   dri_st_framebuffer_validate_att(drawable, ST_ATTACHMENT_FRONT_LEFT);
+   dri_drawable_validate_att(drawable, ST_ATTACHMENT_FRONT_LEFT);
 
    pt = drawable->textures[ST_ATTACHMENT_FRONT_LEFT];
 
@@ -332,7 +331,7 @@ dri2_drawable_process_buffers(struct dri_drawable *drawable,
       whandle.stride = buf->pitch;
 
       drawable->textures[statt] =
-         screen->pipe_screen->resource_from_handle(screen->pipe_screen,
+         screen->base.screen->resource_from_handle(screen->base.screen,
                &templ, &whandle);
    }
 
@@ -435,7 +434,7 @@ dri2_create_image_from_name(__DRIcontext *context,
    whandle.handle = name;
    whandle.stride = pitch * util_format_get_blocksize(pf);
 
-   img->texture = screen->pipe_screen->resource_from_handle(screen->pipe_screen,
+   img->texture = screen->base.screen->resource_from_handle(screen->base.screen,
          &templ, &whandle);
    if (!img->texture) {
       FREE(img);
diff --git a/src/gallium/state_trackers/dri/drm/dri_st_api.c b/src/gallium/state_trackers/dri/drm/dri_st_api.c
deleted file mode 120000
index a8f6bd06b09..00000000000
--- a/src/gallium/state_trackers/dri/drm/dri_st_api.c
+++ /dev/null
@@ -1 +0,0 @@
-../common/dri_st_api.c
\ No newline at end of file