KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonsi: get rid of evergreen_hw_context.c 

Signed-off-by: Christian Koenig <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Christian Koenig 2012-09-20 12:00:30 +02:00 committed by Christian König
parent fcc9c125f4
commit 3c51c60ed0
3 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/radeonsi/Makefile.sources
View File

@ -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 \

45
src/gallium/drivers/radeonsi/evergreen_hw_context.c
View File

@ -1,45 +0,0 @@
/*
* Copyright 2010 Jerome Glisse <glisse@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;
}

7
src/gallium/drivers/radeonsi/radeonsi_pipe.c
View File

@ -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: