mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 07:28:11 +02:00
freedreno: use tgsi_lowering
Now that the freedreno_lowering code is moved to tgsi_lowering, remove our private copy and switch over to using the common version. Signed-off-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
Rob Clark
parent
d2c1d9693f
commit
abe3b3d1e0
8 changed files with 6 additions and 1673 deletions
|
|
@ -10,8 +10,6 @@ C_SOURCES := \
|
|||
freedreno_fence.h \
|
||||
freedreno_gmem.c \
|
||||
freedreno_gmem.h \
|
||||
freedreno_lowering.c \
|
||||
freedreno_lowering.h \
|
||||
freedreno_program.c \
|
||||
freedreno_program.h \
|
||||
freedreno_query.c \
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include "tgsi/tgsi_dump.h"
|
||||
#include "tgsi/tgsi_parse.h"
|
||||
|
||||
#include "freedreno_lowering.h"
|
||||
#include "freedreno_program.h"
|
||||
|
||||
#include "fd3_program.h"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,89 +0,0 @@
|
|||
/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2014 Rob Clark <robclark@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
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* 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 NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS 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:
|
||||
* Rob Clark <robclark@freedesktop.org>
|
||||
*/
|
||||
|
||||
#ifndef FREEDRENO_LOWERING_H_
|
||||
#define FREEDRENO_LOWERING_H_
|
||||
|
||||
#include "pipe/p_shader_tokens.h"
|
||||
#include "tgsi/tgsi_scan.h"
|
||||
|
||||
struct fd_lowering_config {
|
||||
/* For fragment shaders, generate a shader that emulates two
|
||||
* sided color by inserting a BGCOLOR input for each COLOR
|
||||
* input, and insert a CMP instruction to select the correct
|
||||
* color to use based on the TGSI_SEMANTIC_FACE input.
|
||||
*
|
||||
* Note that drivers which use this to emulate two sided color
|
||||
* will:
|
||||
* a) need to generate (on demand) alternate shaders to use
|
||||
* depending on the rasterizer state (ie. whether two
|
||||
* sided shading enabled)
|
||||
* b) expect to see the BGCOLOR semantic name in fragment
|
||||
* shaders. During linkage, the driver should simply
|
||||
* map VS.OUT.BGCOLOR[n] to FS.IN.BGCOLOR[n] (in the
|
||||
* same was as linking other outs/ins).
|
||||
*/
|
||||
unsigned color_two_side : 1;
|
||||
|
||||
/* TODO support for alpha_to_one as well?? */
|
||||
|
||||
/* Individual OPC lowerings, if lower_<opc> is TRUE then
|
||||
* enable lowering of TGSI_OPCODE_<opc>
|
||||
*/
|
||||
unsigned lower_DST : 1;
|
||||
unsigned lower_XPD : 1;
|
||||
unsigned lower_SCS : 1;
|
||||
unsigned lower_LRP : 1;
|
||||
unsigned lower_FRC : 1;
|
||||
unsigned lower_POW : 1;
|
||||
unsigned lower_LIT : 1;
|
||||
unsigned lower_EXP : 1;
|
||||
unsigned lower_LOG : 1;
|
||||
unsigned lower_DP4 : 1;
|
||||
unsigned lower_DP3 : 1;
|
||||
unsigned lower_DPH : 1;
|
||||
unsigned lower_DP2 : 1;
|
||||
unsigned lower_DP2A : 1;
|
||||
|
||||
/* To emulate certain texture wrap modes, this can be used
|
||||
* to saturate the specified tex coord to [0.0, 1.0]. The
|
||||
* bits are according to sampler #, ie. if, for example:
|
||||
*
|
||||
* (conf->saturate_s & (1 << n))
|
||||
*
|
||||
* is true, then the s coord for sampler n is saturated.
|
||||
*/
|
||||
unsigned saturate_s, saturate_t, saturate_r;
|
||||
};
|
||||
|
||||
const struct tgsi_token * fd_transform_lowering(
|
||||
const struct fd_lowering_config *config,
|
||||
const struct tgsi_token *tokens,
|
||||
struct tgsi_shader_info *info);
|
||||
|
||||
#endif /* FREEDRENO_LOWERING_H_ */
|
||||
|
|
@ -37,7 +37,6 @@
|
|||
#include "tgsi/tgsi_dump.h"
|
||||
|
||||
#include "freedreno_util.h"
|
||||
#include "freedreno_lowering.h"
|
||||
|
||||
#include "ir3_compiler.h"
|
||||
#include "instr-a3xx.h"
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
#include "util/u_string.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_inlines.h"
|
||||
#include "tgsi/tgsi_lowering.h"
|
||||
#include "tgsi/tgsi_parse.h"
|
||||
#include "tgsi/tgsi_ureg.h"
|
||||
#include "tgsi/tgsi_info.h"
|
||||
|
|
@ -39,7 +40,6 @@
|
|||
#include "tgsi/tgsi_dump.h"
|
||||
#include "tgsi/tgsi_scan.h"
|
||||
|
||||
#include "freedreno_lowering.h"
|
||||
#include "freedreno_util.h"
|
||||
|
||||
#include "ir3_compiler.h"
|
||||
|
|
@ -135,7 +135,7 @@ compile_init(struct ir3_compile_context *ctx, struct ir3_shader_variant *so,
|
|||
{
|
||||
unsigned ret;
|
||||
struct tgsi_shader_info *info = &ctx->info;
|
||||
struct fd_lowering_config lconfig = {
|
||||
struct tgsi_lowering_config lconfig = {
|
||||
.color_two_side = so->key.color_two_side,
|
||||
.lower_DST = true,
|
||||
.lower_XPD = true,
|
||||
|
|
@ -167,7 +167,7 @@ compile_init(struct ir3_compile_context *ctx, struct ir3_shader_variant *so,
|
|||
break;
|
||||
}
|
||||
|
||||
ctx->tokens = fd_transform_lowering(&lconfig, tokens, &ctx->info);
|
||||
ctx->tokens = tgsi_transform_lowering(&lconfig, tokens, &ctx->info);
|
||||
ctx->free_tokens = !!ctx->tokens;
|
||||
if (!ctx->tokens) {
|
||||
/* no lowering */
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
#include "util/u_string.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_inlines.h"
|
||||
#include "tgsi/tgsi_lowering.h"
|
||||
#include "tgsi/tgsi_parse.h"
|
||||
#include "tgsi/tgsi_ureg.h"
|
||||
#include "tgsi/tgsi_info.h"
|
||||
|
|
@ -39,7 +40,6 @@
|
|||
#include "tgsi/tgsi_dump.h"
|
||||
#include "tgsi/tgsi_scan.h"
|
||||
|
||||
#include "freedreno_lowering.h"
|
||||
#include "freedreno_util.h"
|
||||
|
||||
#include "ir3_compiler.h"
|
||||
|
|
@ -125,7 +125,7 @@ compile_init(struct ir3_compile_context *ctx, struct ir3_shader_variant *so,
|
|||
{
|
||||
unsigned ret, base = 0;
|
||||
struct tgsi_shader_info *info = &ctx->info;
|
||||
struct fd_lowering_config lconfig = {
|
||||
struct tgsi_lowering_config lconfig = {
|
||||
.color_two_side = so->key.color_two_side,
|
||||
.lower_DST = true,
|
||||
.lower_XPD = true,
|
||||
|
|
@ -157,7 +157,7 @@ compile_init(struct ir3_compile_context *ctx, struct ir3_shader_variant *so,
|
|||
break;
|
||||
}
|
||||
|
||||
ctx->tokens = fd_transform_lowering(&lconfig, tokens, &ctx->info);
|
||||
ctx->tokens = tgsi_transform_lowering(&lconfig, tokens, &ctx->info);
|
||||
ctx->free_tokens = !!ctx->tokens;
|
||||
if (!ctx->tokens) {
|
||||
/* no lowering */
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
#include "tgsi/tgsi_parse.h"
|
||||
|
||||
#include "freedreno_context.h"
|
||||
#include "freedreno_lowering.h"
|
||||
#include "freedreno_util.h"
|
||||
|
||||
#include "ir3_shader.h"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue