OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: 8x MRT support

Browse Source 
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5892>
This commit is contained in:
Icecream95
2020-07-14 12:05:47 +12:00
committed by Marge Bot
parent 978f963ea4
commit 3ec252a3b2
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/features.txt
View File

@@ -64,7 +64,7 @@ GL 3.0, GLSL 1.30 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llv
Depth format cube textures DONE (panfrost) Depth format cube textures DONE (panfrost)
GLX_ARB_create_context (GLX 1.4 is required) DONE (panfrost, v3d) GLX_ARB_create_context (GLX 1.4 is required) DONE (panfrost, v3d)
Multisample anti-aliasing DONE (freedreno/a5xx+, freedreno (*), llvmpipe (*), softpipe (*), swr (*), panfrost) Multisample anti-aliasing DONE (freedreno/a5xx+, freedreno (*), llvmpipe (*), softpipe (*), swr (*), panfrost)
8 draw buffers DONE () 8 draw buffers DONE (panfrost/t760+)
(*) freedreno (a2xx-a4xx), llvmpipe, softpipe, and swr have fake Multisample anti-aliasing support (*) freedreno (a2xx-a4xx), llvmpipe, softpipe, and swr have fake Multisample anti-aliasing support

6
src/gallium/drivers/panfrost/pan_mfbd.c
View File

@@ -401,7 +401,7 @@ panfrost_mfbd_upload(struct panfrost_batch *batch,
size_t total_sz = size_t total_sz =
sizeof(struct mali_framebuffer) + sizeof(struct mali_framebuffer) +
(has_extra ? sizeof(struct mali_framebuffer_extra) : 0) + (has_extra ? sizeof(struct mali_framebuffer_extra) : 0) +
sizeof(struct mali_render_target) * 4; sizeof(struct mali_render_target) * 8;
struct panfrost_transfer m_f_trans = struct panfrost_transfer m_f_trans =
panfrost_pool_alloc(&batch->pool, total_sz); panfrost_pool_alloc(&batch->pool, total_sz);
@@ -413,7 +413,7 @@ panfrost_mfbd_upload(struct panfrost_batch *batch,
if (has_extra) if (has_extra)
UPLOAD(m_f_trans, offset, fbx, total_sz); UPLOAD(m_f_trans, offset, fbx, total_sz);
for (unsigned c = 0; c < 4; ++c) { for (unsigned c = 0; c < 8; ++c) {
UPLOAD(m_f_trans, offset, &rts[c], total_sz); UPLOAD(m_f_trans, offset, &rts[c], total_sz);
} }
@@ -541,7 +541,7 @@ panfrost_mfbd_fragment(struct panfrost_batch *batch, bool has_draws)
struct mali_framebuffer fb = panfrost_emit_mfbd(batch, has_draws); struct mali_framebuffer fb = panfrost_emit_mfbd(batch, has_draws);
struct mali_framebuffer_extra fbx = {0}; struct mali_framebuffer_extra fbx = {0};
struct mali_render_target rts[4] = {0}; struct mali_render_target rts[8] = {0};
/* We always upload at least one dummy GL_NONE render target */ /* We always upload at least one dummy GL_NONE render target */

4
src/gallium/drivers/panfrost/pan_screen.c
View File

@@ -120,7 +120,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
case PIPE_CAP_MAX_RENDER_TARGETS: case PIPE_CAP_MAX_RENDER_TARGETS:
case PIPE_CAP_FBFETCH: case PIPE_CAP_FBFETCH:
case PIPE_CAP_FBFETCH_COHERENT: case PIPE_CAP_FBFETCH_COHERENT:
return has_mrt ? 4 : 1; return has_mrt ? 8 : 1;
case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
return 1; return 1;
@@ -300,7 +300,7 @@ panfrost_get_shader_param(struct pipe_screen *screen,
return 16; return 16;
case PIPE_SHADER_CAP_MAX_OUTPUTS: case PIPE_SHADER_CAP_MAX_OUTPUTS:
return shader == PIPE_SHADER_FRAGMENT ? 4 : 16; return shader == PIPE_SHADER_FRAGMENT ? 8 : 16;
case PIPE_SHADER_CAP_MAX_TEMPS: case PIPE_SHADER_CAP_MAX_TEMPS:
return 256; /* GL_MAX_PROGRAM_TEMPORARIES_ARB */ return 256; /* GL_MAX_PROGRAM_TEMPORARIES_ARB */

4
src/panfrost/include/panfrost-job.h
View File

@@ -1849,8 +1849,8 @@ struct mali_framebuffer {
u32 zero3; u32 zero3;
u16 width2, height2; u16 width2, height2;
u32 unk1 : 19; // = 0x01000 u32 unk1 : 19; // = 0x01000
u32 rt_count_1 : 2; // off-by-one (use MALI_POSITIVE) u32 rt_count_1 : 3; // off-by-one (use MALI_POSITIVE)
u32 unk2 : 3; // = 0 u32 unk2 : 2; // = 0
u32 rt_count_2 : 3; // no off-by-one u32 rt_count_2 : 3; // no off-by-one
u32 zero4 : 5; u32 zero4 : 5;
/* 0x30 */ /* 0x30 */