GPU: Add HQ normals workaround.
This change makes it possible for platforms to only support high quality normal rendering. This is part of {T82856} where current AMD drivers running on the polaris architecture does not support the low quality setting due to a driver bug. In a next commit the work around will be enabled.
This commit is contained in:
parent
2f3e97b6d3
commit
db7c7486fd
Notes:
blender-bot
2023-02-13 23:16:02 +01:00
Referenced by issue #77348, Blender LTS: Maintenance Task 2.83
|
@ -4543,7 +4543,8 @@ static void extract_task_create(TaskPool *task_pool,
|
|||
int32_t *task_counter)
|
||||
{
|
||||
BLI_assert(scene != NULL);
|
||||
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0;
|
||||
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0 ||
|
||||
GPU_use_hq_normals_workaround();
|
||||
if (do_hq_normals && (extract == &extract_lnor)) {
|
||||
extract = &extract_lnor_hq;
|
||||
}
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include "BKE_font.h"
|
||||
|
||||
#include "GPU_batch.h"
|
||||
#include "GPU_extensions.h"
|
||||
#include "GPU_material.h"
|
||||
#include "GPU_texture.h"
|
||||
|
||||
|
@ -633,11 +634,11 @@ static void curve_create_edit_curves_nor(CurveRenderData *rdata,
|
|||
GPUVertBuf *vbo_curves_nor,
|
||||
const Scene *scene)
|
||||
{
|
||||
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0;
|
||||
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0 ||
|
||||
GPU_use_hq_normals_workaround();
|
||||
|
||||
static GPUVertFormat format = {0};
|
||||
static GPUVertFormat format_hq = {0};
|
||||
/* TODO(jeroen): add support for high quality normals */
|
||||
static struct {
|
||||
uint pos, nor, tan, rad;
|
||||
uint pos_hq, nor_hq, tan_hq, rad_hq;
|
||||
|
|
|
@ -177,7 +177,8 @@ static int displist_indexbufbuilder_tess_set(
|
|||
|
||||
void DRW_displist_vertbuf_create_pos_and_nor(ListBase *lb, GPUVertBuf *vbo, const Scene *scene)
|
||||
{
|
||||
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0;
|
||||
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0 ||
|
||||
GPU_use_hq_normals_workaround();
|
||||
|
||||
static GPUVertFormat format = {0};
|
||||
static GPUVertFormat format_hq = {0};
|
||||
|
@ -485,7 +486,8 @@ void DRW_displist_vertbuf_create_loop_pos_and_nor_and_uv_and_tan(ListBase *lb,
|
|||
GPUVertBuf *vbo_tan,
|
||||
const Scene *scene)
|
||||
{
|
||||
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0;
|
||||
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0 ||
|
||||
GPU_use_hq_normals_workaround();
|
||||
|
||||
static GPUVertFormat format_pos_nor = {0};
|
||||
static GPUVertFormat format_pos_nor_hq = {0};
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
#include "BKE_volume_render.h"
|
||||
|
||||
#include "GPU_batch.h"
|
||||
#include "GPU_extensions.h"
|
||||
#include "GPU_texture.h"
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
@ -151,7 +152,8 @@ static void drw_volume_wireframe_cb(
|
|||
Scene *scene = data->scene;
|
||||
Volume *volume = data->volume;
|
||||
VolumeBatchCache *cache = volume->batch_cache;
|
||||
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0;
|
||||
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0 ||
|
||||
GPU_use_hq_normals_workaround();
|
||||
|
||||
/* Create vertex buffer. */
|
||||
static GPUVertFormat format = {0};
|
||||
|
|
|
@ -50,6 +50,7 @@ bool GPU_depth_blitting_workaround(void);
|
|||
bool GPU_unused_fb_slot_workaround(void);
|
||||
bool GPU_context_local_shaders_workaround(void);
|
||||
bool GPU_texture_copy_workaround(void);
|
||||
bool GPU_use_hq_normals_workaround(void);
|
||||
bool GPU_crappy_amd_driver(void);
|
||||
|
||||
bool GPU_mem_stats_supported(void);
|
||||
|
|
|
@ -99,6 +99,7 @@ static struct GPUGlobal {
|
|||
/* Intel drivers exhibit artifacts when using glCopyImageSubData & workbench antialiasing.
|
||||
* (see T76273) */
|
||||
bool texture_copy_workaround;
|
||||
bool use_hq_normals_workaround;
|
||||
} GG = {1, 0};
|
||||
|
||||
static void gpu_detect_mip_render_workaround(void)
|
||||
|
@ -238,6 +239,11 @@ bool GPU_crappy_amd_driver(void)
|
|||
return GG.broken_amd_driver;
|
||||
}
|
||||
|
||||
bool GPU_use_hq_normals_workaround(void)
|
||||
{
|
||||
return GG.use_hq_normals_workaround;
|
||||
}
|
||||
|
||||
void gpu_extensions_init(void)
|
||||
{
|
||||
/* during 2.8 development each platform has its own OpenGL minimum requirements
|
||||
|
|
Loading…
Reference in New Issue