On 16.01.2018 22:18, Timothy Arceri wrote:
This resolves a game bug in Deal Island. The game doesn't properly

s/Deal/Dead/

Series is:

Reviewed-by: Nicolai Hähnle <[email protected]>


handle ARB_get_program_binary with 0 supported formats, and ends up
crashing.

This will enable ARB_get_program_binary binary support for any
driver that currently enables the on-disk shader cache.

Tested-by: Dieter Nützel <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85564
---
  src/mesa/state_tracker/st_context.c    | 6 ++++++
  src/mesa/state_tracker/st_extensions.c | 4 ++++
  2 files changed, 10 insertions(+)

diff --git a/src/mesa/state_tracker/st_context.c 
b/src/mesa/state_tracker/st_context.c
index 7564a53035..a7b2cfc12b 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -74,6 +74,7 @@
  #include "st_pbo.h"
  #include "st_program.h"
  #include "st_sampler_view.h"
+#include "st_shader_cache.h"
  #include "st_vdpau.h"
  #include "st_texture.h"
  #include "pipe/p_context.h"
@@ -760,4 +761,9 @@ st_init_driver_functions(struct pipe_screen *screen,
     functions->SetBackgroundContext = st_set_background_context;
     functions->GetDriverUuid = st_get_device_uuid;
     functions->GetDeviceUuid = st_get_driver_uuid;
+
+   /* GL_ARB_get_program_binary */
+   functions->GetProgramBinaryDriverSHA1 = st_get_program_binary_driver_sha1;
+   functions->ProgramBinarySerializeDriverBlob = st_serialise_tgsi_program;
+   functions->ProgramBinaryDeserializeDriverBlob = st_deserialise_tgsi_program;
  }
diff --git a/src/mesa/state_tracker/st_extensions.c 
b/src/mesa/state_tracker/st_extensions.c
index 9ef0df1e92..5c5cfaaaba 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -417,6 +417,10 @@ void st_init_limits(struct pipe_screen *screen,
     c->GLSLFrontFacingIsSysVal =
        screen->get_param(screen, PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL);
+ /* GL_ARB_get_program_binary */
+   if (screen->get_disk_shader_cache && screen->get_disk_shader_cache(screen))
+      c->NumProgramBinaryFormats = 1;
+
     c->MaxAtomicBufferBindings =
            c->Program[MESA_SHADER_FRAGMENT].MaxAtomicBuffers;


--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to