blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Draw: Fix RenderDoc compatibility (Windows+Nvidia) #109214

Merged
Miguel Pozo merged 2 commits from pragma37/blender:pull-renderdoc-fix into main 2023-06-23 16:02:27 +02:00
Conversation 0 Commits 2 Files Changed 1 +7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/draw/intern/draw_manager_shader.c
View File

@ -264,6 +264,13 @@ static void drw_deferred_shader_add(GPUMaterial *mat, bool deferred)
deferred = false;
}
/* Avoid crashes with RenderDoc on Windows + Nvidia. */
if (G.debug & G_DEBUG_GPU_RENDERDOC &&
GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_ANY, GPU_DRIVER_OFFICIAL))
Jeroen Bakker commented 2023-06-22 08:13:03 +02:00
Outdated
Review
Copy Link

Is this a windows only issue. I would assume that we should check on GPU_OS_ANY as the drivers between linux/windows are 'the same'. I am aware that renderdoc doesn't support multithreading so we might consider to do this for all platforms.

Is this a windows only issue. I would assume that we should check on `GPU_OS_ANY` as the drivers between linux/windows are 'the same'. I am aware that renderdoc doesn't support multithreading so we might consider to do this for all platforms.
Miguel Pozo commented 2023-06-22 15:48:40 +02:00
Outdated
Review
Copy Link

Is this a windows only issue.

Not sure. I don't have a working Linux installation on my desktop at the moment.

I am aware that renderdoc doesn't support multithreading so we might consider to do this for all platforms.

Doesn't AMD work just fine? Without this fix, Blender crashes when switching to EEVEE on Windows+Nvidia.

> Is this a windows only issue. Not sure. I don't have a working Linux installation on my desktop at the moment. > I am aware that renderdoc doesn't support multithreading so we might consider to do this for all platforms. Doesn't AMD work just fine? Without this fix, Blender crashes when switching to EEVEE on Windows+Nvidia.
{
deferred = false;
}
if (!deferred) {
DRW_deferred_shader_remove(mat);
/* Shaders could already be compiling. Have to wait for compilation to finish. */