ngscopeclient · Apr 24, 2021 · Apr 24, 2021
Showing with 12 additions and 3 deletions.

+1 −1 lib

+2 −0 src/glscopeclient/WaveformArea.cpp

+5 −1 src/glscopeclient/shaders/waveform-compute-head-noint64.glsl

+4 −1 src/glscopeclient/shaders/waveform-compute-head.glsl
diff --git a/lib b/lib
diff --git a/src/glscopeclient/WaveformArea.cpp b/src/glscopeclient/WaveformArea.cpp
@@ -530,10 +530,12 @@ void WaveformArea::on_realize()
 			!GLEW_EXT_framebuffer_object ||
 			!GLEW_ARB_vertex_array_object ||
 			!GLEW_ARB_shader_storage_buffer_object ||
+			!GLEW_ARB_arrays_of_arrays ||
 			!GLEW_ARB_compute_shader)
 		{
 			string err =
 				"Your graphics card or driver does not appear to support one or more of the following required extensions:\n"
+				"* GL_ARB_arrays_of_arrays\n"
 				"* GL_ARB_compute_shader\n"
 				"* GL_ARB_shader_storage_buffer_object\n"
 				"* GL_ARB_vertex_array_object\n"

diff --git a/src/glscopeclient/shaders/waveform-compute-head-noint64.glsl b/src/glscopeclient/shaders/waveform-compute-head-noint64.glsl
@@ -32,7 +32,11 @@
 	@brief Waveform rendering shader for without GL_ARB_gpu_shader_int64 support
  */
 
-#version 430
+#version 420
+#extension GL_ARB_compute_shader : require
+#extension GL_ARB_gpu_shader_int64 : require
+#extension GL_ARB_arrays_of_arrays : require
+#extension GL_ARB_shader_storage_buffer_object : require
 
 layout(std430, binding=1) buffer waveform_x
 {

diff --git a/src/glscopeclient/shaders/waveform-compute-head.glsl b/src/glscopeclient/shaders/waveform-compute-head.glsl
@@ -32,8 +32,11 @@
 	@brief Waveform rendering shader for analog waveforms with GL_ARB_gpu_shader_int64 support
  */
 
-#version 450
+#version 420
+#extension GL_ARB_compute_shader : require
 #extension GL_ARB_gpu_shader_int64 : require
+#extension GL_ARB_arrays_of_arrays : require
+#extension GL_ARB_shader_storage_buffer_object : require
 
 layout(std430, binding=1) buffer waveform_x
 {
+58 −1		scopehal/MockOscilloscope.cpp
+2 −0		scopehal/MockOscilloscope.h
+43 −0		scopeprotocols/SPIFlashDecoder.cpp
+5 −0		scopeprotocols/SPIFlashDecoder.h