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

freedreno: enable tiled textures for debug builds

This commit is contained in:
Khaled Emara 2019-08-03 14:29:43 +02:00 committed by Rob Clark
parent 866bb775de
commit e11a239e8c
9 changed files with 173 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/freedreno/Makefile.sources
View File

@ -95,6 +95,8 @@ a3xx_SOURCES := \
a3xx/fd3_query.h \
a3xx/fd3_rasterizer.c \
a3xx/fd3_rasterizer.h \
a3xx/fd3_resource.c \
a3xx/fd3_resource.h \
a3xx/fd3_screen.c \
a3xx/fd3_screen.h \
a3xx/fd3_texture.c \

15
src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
View File

@ -49,12 +49,6 @@ emit_mrt(struct fd_ringbuffer *ring, unsigned nr_bufs,
enum a3xx_tile_mode tile_mode;
unsigned i;
if (bin_w) {
tile_mode = TILE_32X32;
} else {
tile_mode = LINEAR;
}
for (i = 0; i < A3XX_MAX_RENDER_TARGETS; i++) {
enum pipe_format pformat = 0;
enum a3xx_color_fmt format = 0;
@ -66,6 +60,12 @@ emit_mrt(struct fd_ringbuffer *ring, unsigned nr_bufs,
uint32_t base = 0;
uint32_t offset = 0;
if (bin_w) {
tile_mode = TILE_32X32;
} else {
tile_mode = LINEAR;
}
if ((i < nr_bufs) && bufs[i]) {
struct pipe_surface *psurf = bufs[i];
@ -82,7 +82,6 @@ emit_mrt(struct fd_ringbuffer *ring, unsigned nr_bufs,
}
slice = fd_resource_slice(rsc, psurf->u.tex.level);
format = fd3_pipe2color(pformat);
swap = fd3_pipe2swap(pformat);
if (decode_srgb)
srgb = util_format_is_srgb(pformat);
else
@ -92,6 +91,7 @@ emit_mrt(struct fd_ringbuffer *ring, unsigned nr_bufs,
offset = fd_resource_offset(rsc, psurf->u.tex.level,
psurf->u.tex.first_layer);
swap = rsc->tile_mode ? WZYX : fd3_pipe2swap(pformat);
if (bin_w) {
stride = bin_w * rsc->cpp;
@ -101,6 +101,7 @@ emit_mrt(struct fd_ringbuffer *ring, unsigned nr_bufs,
}
} else {
stride = slice->pitch * rsc->cpp;
tile_mode = rsc->tile_mode;
}
} else if (i < nr_bufs && bases) {
base = bases[i];

116
src/gallium/drivers/freedreno/a3xx/fd3_resource.c Normal file
View File

@ -0,0 +1,116 @@
/*
* Copyright (C) 2012 Rob Clark <robclark@freedesktop.org>
* Copyright (C) 2019 Khaled Emara <ekhaled1836@gmail.com>
*
* 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.
*/
#include "fd3_resource.h"
#include "fd3_format.h"
static uint32_t
setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format format)
{
struct pipe_resource *prsc = &rsc->base;
struct fd_screen *screen = fd_screen(prsc->screen);
enum util_format_layout layout = util_format_description(format)->layout;
uint32_t pitchalign = screen->gmem_alignw;
uint32_t level, size = 0;
uint32_t width = prsc->width0;
uint32_t height = prsc->height0;
uint32_t depth = prsc->depth0;
/* in layer_first layout, the level (slice) contains just one
* layer (since in fact the layer contains the slices)
*/
uint32_t layers_in_level = rsc->layer_first ? 1 : prsc->array_size;
for (level = 0; level <= prsc->last_level; level++) {
struct fd_resource_slice *slice = fd_resource_slice(rsc, level);
uint32_t blocks;
if (layout == UTIL_FORMAT_LAYOUT_ASTC)
slice->pitch = width =
util_align_npot(width, pitchalign * util_format_get_blockwidth(format));
else
slice->pitch = width = align(width, pitchalign);
slice->offset = size;
blocks = util_format_get_nblocks(format, width, height);
/* 1d array and 2d array textures must all have the same layer size
* for each miplevel on a3xx. 3d textures can have different layer
* sizes for high levels, but the hw auto-sizer is buggy (or at least
* different than what this code does), so as soon as the layer size
* range gets into range, we stop reducing it.
*/
if (prsc->target == PIPE_TEXTURE_3D && (
level == 1 ||
(level > 1 && rsc->slices[level - 1].size0 > 0xf000)))
slice->size0 = align(blocks * rsc->cpp, alignment);
else if (level == 0 || rsc->layer_first || alignment == 1)
slice->size0 = align(blocks * rsc->cpp, alignment);
else
slice->size0 = rsc->slices[level - 1].size0;
size += slice->size0 * depth * layers_in_level;
width = u_minify(width, 1);
height = u_minify(height, 1);
depth = u_minify(depth, 1);
}
return size;
}
uint32_t
fd3_setup_slices(struct fd_resource *rsc)
{
uint32_t alignment;
switch (rsc->base.target) {
case PIPE_TEXTURE_3D:
case PIPE_TEXTURE_1D_ARRAY:
case PIPE_TEXTURE_2D_ARRAY:
alignment = 4096;
break;
default:
alignment = 1;
break;
}
return setup_slices(rsc, alignment, rsc->base.format);
}
static bool
ok_format(enum pipe_format pfmt)
{
enum a3xx_color_fmt fmt = fd3_pipe2color(pfmt);
if (fmt == ~0)
return false;
return true;
}
unsigned
fd3_tile_mode(const struct pipe_resource *tmpl)
{
if (ok_format(tmpl->format))
return TILE_4X4;
return LINEAR;
}

35
src/gallium/drivers/freedreno/a3xx/fd3_resource.h Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright (C) 2012 Rob Clark <robclark@freedesktop.org>
* Copyright (C) 2019 Khaled Emara <ekhaled1836@gmail.com>
*
* 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.
*/
#ifndef FD3_RESOURCE_H_
#define FD3_RESOURCE_H_
#include "pipe/p_state.h"
#include "freedreno_resource.h"
uint32_t fd3_setup_slices(struct fd_resource *rsc);
unsigned fd3_tile_mode(const struct pipe_resource *tmpl);
#endif /* FD3_RESOURCE_H_ */

5
src/gallium/drivers/freedreno/a3xx/fd3_screen.c
View File

@ -30,6 +30,7 @@
#include "fd3_screen.h"
#include "fd3_context.h"
#include "fd3_format.h"
#include "fd3_resource.h"
#include "ir3/ir3_compiler.h"
@ -106,4 +107,8 @@ fd3_screen_init(struct pipe_screen *pscreen)
screen->compiler = ir3_compiler_create(screen->dev, screen->gpu_id);
pscreen->context_create = fd3_context_create;
pscreen->is_format_supported = fd3_screen_is_format_supported;
screen->setup_slices = fd3_setup_slices;
if (fd_mesa_debug & FD_DBG_TTILE)
screen->tile_mode = fd3_tile_mode;
}

1
src/gallium/drivers/freedreno/a3xx/fd3_texture.c
View File

@ -227,6 +227,7 @@ fd3_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
so->base.context = pctx;
so->texconst0 =
A3XX_TEX_CONST_0_TILE_MODE(rsc->tile_mode) |
A3XX_TEX_CONST_0_TYPE(tex_type(prsc->target)) |
A3XX_TEX_CONST_0_FMT(fd3_pipe2tex(cso->format)) |
fd3_tex_swiz(cso->format, cso->swizzle_r, cso->swizzle_g,

3
src/gallium/drivers/freedreno/freedreno_resource.h
View File

@ -188,6 +188,9 @@ fd_resource_ubwc_offset(struct fd_resource *rsc, unsigned level, unsigned layer)
static inline bool
fd_resource_level_linear(struct pipe_resource *prsc, int level)
{
struct fd_screen *screen = fd_screen(prsc->screen);
debug_assert(!is_a3xx(screen));
unsigned w = u_minify(prsc->width0, level);
if (w < 16)
return true;

2
src/gallium/drivers/freedreno/freedreno_screen.c
View File

@ -85,7 +85,7 @@ static const struct debug_named_value debug_options[] = {
{"noindirect",FD_DBG_NOINDR, "Disable hw indirect draws (emulate on CPU)"},
{"noblit", FD_DBG_NOBLIT, "Disable blitter (fallback to generic blit path)"},
{"hiprio", FD_DBG_HIPRIO, "Force high-priority context"},
{"ttile", FD_DBG_TTILE, "Enable texture tiling (a2xx/a5xx)"},
{"ttile", FD_DBG_TTILE, "Enable texture tiling (a2xx/a3xx/a5xx)"},
{"perfcntrs", FD_DBG_PERFC, "Expose performance counters"},
{"noubwc", FD_DBG_NOUBWC, "Disable UBWC for all internal buffers"},
DEBUG_NAMED_VALUE_END

2
src/gallium/drivers/freedreno/meson.build
View File

@ -111,6 +111,8 @@ files_libfreedreno = files(
'a3xx/fd3_query.h',
'a3xx/fd3_rasterizer.c',
'a3xx/fd3_rasterizer.h',
'a3xx/fd3_resource.c',
'a3xx/fd3_resource.h',
'a3xx/fd3_screen.c',
'a3xx/fd3_screen.h',
'a3xx/fd3_texture.c',