Module: Mesa
Branch: master
Commit: 3c51c60ed00b5777cb5c55664c2da8e010a4f385
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c51c60ed00b5777cb5c55664c2da8e010a4f385
Author: Christian Koenig <christian.koe...@amd.com>
Date: Thu Sep 20 12:00:30 2012 +0200
radeonsi: get rid of evergreen_hw_context.c
Signed-off-by: Christian Koenig <christian.koe...@amd.com>
Reviewed-by: Michel Dänzer <michel.daen...@amd.com>
---
src/gallium/drivers/radeonsi/Makefile.sources | 1 -
.../drivers/radeonsi/evergreen_hw_context.c | 45 --------------------
src/gallium/drivers/radeonsi/radeonsi_pipe.c | 7 +--
3 files changed, 3 insertions(+), 50 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/Makefile.sources
b/src/gallium/drivers/radeonsi/Makefile.sources
index f1b4936..65da1ac 100644
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -7,7 +7,6 @@ C_SOURCES := \
r600_resource.c \
radeonsi_shader.c \
r600_texture.c \
- evergreen_hw_context.c \
r600_translate.c \
radeonsi_pm4.c \
si_state.c \
diff --git a/src/gallium/drivers/radeonsi/evergreen_hw_context.c
b/src/gallium/drivers/radeonsi/evergreen_hw_context.c
deleted file mode 100644
index 44fc950..0000000
--- a/src/gallium/drivers/radeonsi/evergreen_hw_context.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2010 Jerome Glisse <gli...@freedesktop.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Jerome Glisse
- */
-#include "r600.h"
-#include "r600_hw_context_priv.h"
-#include "radeonsi_pipe.h"
-#include "sid.h"
-#include "util/u_memory.h"
-#include <errno.h>
-
-int si_context_init(struct r600_context *ctx)
-{
- int r;
-
- LIST_INITHEAD(&ctx->active_query_list);
-
- ctx->cs = ctx->ws->cs_create(ctx->ws);
-
- ctx->max_db = 8;
- return 0;
-}
-
-
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
index 03fe88d..7c48db7 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
@@ -219,10 +219,9 @@ static struct pipe_context *r600_create_context(struct
pipe_screen *screen, void
switch (rctx->chip_class) {
case TAHITI:
si_init_state_functions(rctx);
- if (si_context_init(rctx)) {
- r600_destroy_context(&rctx->context);
- return NULL;
- }
+ LIST_INITHEAD(&rctx->active_query_list);
+ rctx->cs = rctx->ws->cs_create(rctx->ws);
+ rctx->max_db = 8;
si_init_config(rctx);
break;
default:
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
