Merge remote branch 'origin/master' into lp-setup-llvm

Conflicts:
	src/gallium/drivers/llvmpipe/lp_setup_coef.c
	src/gallium/drivers/llvmpipe/lp_setup_coef.h
	src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
	src/gallium/drivers/llvmpipe/lp_setup_point.c
	src/gallium/drivers/llvmpipe/lp_setup_tri.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.h

1 files changed, 0 insertions, 167 deletions

diff --git a/src/gallium/drivers/r600/r600_context.c b/src/gallium/drivers/r600/r600_context.c
deleted file mode 100644
index 776dc24569b..00000000000
--- a/src/gallium/drivers/r600/r600_context.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright 2010 Jerome Glisse <[email protected]>
- *
- * 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
- *      Corbin Simpson
- */
-#include <stdio.h>
-#include <util/u_inlines.h>
-#include <util/u_format.h>
-#include <util/u_memory.h>
-#include <util/u_upload_mgr.h>
-#include <util/u_blitter.h>
-#include "r600_screen.h"
-#include "r600_context.h"
-#include "r600_resource.h"
-
-static void r600_destroy_context(struct pipe_context *context)
-{
-	struct r600_context *rctx = r600_context(context);
-
-	rctx->rasterizer = r600_context_state_decref(rctx->rasterizer);
-	rctx->poly_stipple = r600_context_state_decref(rctx->poly_stipple);
-	rctx->scissor = r600_context_state_decref(rctx->scissor);
-	rctx->clip = r600_context_state_decref(rctx->clip);
-	rctx->ps_shader = r600_context_state_decref(rctx->ps_shader);
-	rctx->vs_shader = r600_context_state_decref(rctx->vs_shader);
-	rctx->depth = r600_context_state_decref(rctx->depth);
-	rctx->stencil = r600_context_state_decref(rctx->stencil);
-	rctx->alpha = r600_context_state_decref(rctx->alpha);
-	rctx->dsa = r600_context_state_decref(rctx->dsa);
-	rctx->blend = r600_context_state_decref(rctx->blend);
-	rctx->stencil_ref = r600_context_state_decref(rctx->stencil_ref);
-	rctx->viewport = r600_context_state_decref(rctx->viewport);
-	rctx->framebuffer = r600_context_state_decref(rctx->framebuffer);
-
-	free(rctx->ps_constant);
-	free(rctx->vs_constant);
-	free(rctx->vs_resource);
-
-	u_upload_destroy(rctx->upload_vb);
-	u_upload_destroy(rctx->upload_ib);
-
-	radeon_ctx_fini(rctx->ctx);
-	FREE(rctx);
-}
-
-void r600_flush(struct pipe_context *ctx, unsigned flags,
-			struct pipe_fence_handle **fence)
-{
-	struct r600_context *rctx = r600_context(ctx);
-	struct r600_query *rquery = NULL;
-
-	/* flush upload buffers */
-	u_upload_flush(rctx->upload_vb);
-	u_upload_flush(rctx->upload_ib);
-
-	/* suspend queries */
-	r600_queries_suspend(ctx);
-
-	radeon_ctx_submit(rctx->ctx);
-
-	LIST_FOR_EACH_ENTRY(rquery, &rctx->query_list, list) {
-		rquery->flushed = true;
-	}
-
-	radeon_ctx_clear(rctx->ctx);
-	/* resume queries */
-	r600_queries_resume(ctx);
-}
-
-void r600_flush_ctx(void *data)
-{
-        struct r600_context *rctx = data;
-
-        rctx->context.flush(&rctx->context, 0, NULL);
-}
-
-struct pipe_context *r600_create_context(struct pipe_screen *screen, void *priv)
-{
-	struct r600_context *rctx = CALLOC_STRUCT(r600_context);
-	struct r600_screen* rscreen = r600_screen(screen);
-
-	if (rctx == NULL)
-		return NULL;
-	rctx->context.winsys = rscreen->screen.winsys;
-	rctx->context.screen = screen;
-	rctx->context.priv = priv;
-	rctx->context.destroy = r600_destroy_context;
-	rctx->context.draw_vbo = r600_draw_vbo;
-	rctx->context.flush = r600_flush;
-
-	/* Easy accessing of screen/winsys. */
-	rctx->screen = rscreen;
-	rctx->rw = rscreen->rw;
-
-	if (rscreen->chip_class == EVERGREEN)
-		rctx->vtbl = &eg_hw_state_vtbl;
-	else
-		rctx->vtbl = &r600_hw_state_vtbl;
-
-	r600_init_blit_functions(rctx);
-	r600_init_query_functions(rctx);
-	r600_init_state_functions(rctx);
-	r600_init_context_resource_functions(rctx);
-
-	rctx->blitter = util_blitter_create(&rctx->context);
-	if (rctx->blitter == NULL) {
-		FREE(rctx);
-		return NULL;
-	}
-
-	rctx->vtbl->init_config(rctx);
-
-	rctx->upload_ib = u_upload_create(&rctx->context, 32 * 1024, 16,
-					  PIPE_BIND_INDEX_BUFFER);
-	if (rctx->upload_ib == NULL) {
-		goto out_free;
-	}
-
-	rctx->upload_vb = u_upload_create(&rctx->context, 128 * 1024, 16,
-					  PIPE_BIND_VERTEX_BUFFER);
-	if (rctx->upload_vb == NULL) {
-		goto out_free;
-	}
-
-	rctx->vs_constant = (struct radeon_state *)calloc(R600_MAX_CONSTANT, sizeof(struct radeon_state));
-	if (!rctx->vs_constant) {
-		goto out_free;
-	}
-
-	rctx->ps_constant = (struct radeon_state *)calloc(R600_MAX_CONSTANT, sizeof(struct radeon_state));
-	if (!rctx->ps_constant) {
-		goto out_free;
-	}
-
-	rctx->vs_resource = (struct radeon_state *)calloc(R600_MAX_RESOURCE, sizeof(struct radeon_state));
-	if (!rctx->vs_resource) {
-		goto out_free;
-	}						   
-
-	rctx->ctx = radeon_ctx_init(rscreen->rw);
-	radeon_draw_init(&rctx->draw, rscreen->rw);
-	return &rctx->context;
- out_free:
-	FREE(rctx);
-	return NULL;
-}