ogl_beamforming

Commit: 2541769f8cfe626ab38228f16b6b7df70f8c2ba7
Parent: 381acaa04883b5658d3656354e017155d1575a3c
Author: Randy Palamar
Date:   Thu, 20 Mar 2025 16:26:52 -0600

core: add support for uHERCULES

Co-Authored-By: Darath <48868688+DarathDev@users.noreply.github.com>

Diffstat:
M
beamformer_parameters.h
 | 
11
++++++-----
M
shaders/das.glsl
 | 
13
++++++++++---
M
ui.c
 | 
2
++

3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/beamformer_parameters.h b/beamformer_parameters.h
@@ -25,11 +25,12 @@ typedef enum {
 
 /* X(type, id, pretty name) */
 #define DAS_TYPES \
-	X(FORCES,   0, "FORCES")   \
-	X(UFORCES,  1, "UFORCES")  \
-	X(HERCULES, 2, "HERCULES") \
-	X(RCA_VLS,  3, "VLS")      \
-	X(RCA_TPW,  4, "TPW")
+	X(FORCES,    0, "FORCES")    \
+	X(UFORCES,   1, "UFORCES")   \
+	X(HERCULES,  2, "HERCULES")  \
+	X(RCA_VLS,   3, "VLS")       \
+	X(RCA_TPW,   4, "TPW")       \
+	X(UHERCULES, 5, "UHERCULES")
 
 #define DAS_LOCAL_SIZE_X 32
 #define DAS_LOCAL_SIZE_Y  1
diff --git a/shaders/das.glsl b/shaders/das.glsl
@@ -155,6 +155,7 @@ vec2 RCA(vec3 image_point, vec3 delta, float apodization_arg)
 
 vec2 HERCULES(vec3 image_point, vec3 delta, float apodization_arg)
 {
+	uint uhercules = uint(das_shader_id == DAS_ID_UHERCULES);
 	uint ridx      = 0;
 	int  direction = beamform_plane;
 	if (direction != TX_ROWS) image_point = image_point.yxz;
@@ -178,12 +179,17 @@ vec2 HERCULES(vec3 image_point, vec3 delta, float apodization_arg)
 
 	vec2 sum = vec2(0);
 	/* NOTE: For Each Acquistion in Raw Data */
-	for (uint i = 0; i < dec_data_dim.z; i++) {
+	for (uint i = uhercules; i < dec_data_dim.z; i++) {
+		uint base_idx = ((i - uhercules) / 8);
+		uint sub_idx  = ((i - uhercules) % 8) / 2;
+		uint shift    = (~(i - uhercules) & 1u) * 16u;
+		uint channel  = (uforces_channels[base_idx][sub_idx] << shift) >> 16u;
+
 		/* NOTE: For Each Virtual Source */
 		for (uint j = 0; j < dec_data_dim.y; j++) {
 			vec3 element_position;
-			if (rx_col) element_position = vec3(j, i, 0) * delta;
-			else        element_position = vec3(i, j, 0) * delta;
+			if (rx_col) element_position = vec3(j, channel, 0) * delta;
+			else        element_position = vec3(channel, j, 0) * delta;
 			vec3 receive_distance = receive_point - element_position;
 			float sidx  = sample_index(transmit_distance + length(receive_distance));
 			vec2 valid  = vec2(sidx >= 0) * vec2(sidx < dec_data_dim.x);
@@ -255,6 +261,7 @@ void main()
 		sum = uFORCES(image_point, vec3(xdc_element_pitch, 0), apod_arg);
 		break;
 	case DAS_ID_HERCULES:
+	case DAS_ID_UHERCULES:
 		sum = HERCULES(image_point, vec3(xdc_element_pitch, 0), apod_arg);
 		break;
 	case DAS_ID_RCA_TPW:
diff --git a/ui.c b/ui.c
@@ -481,10 +481,12 @@ push_das_shader_id(Stream *s, DASShaderID shader, u32 transmit_count)
 	default: break;
 	}
 
+	/* TODO(rnp): cleanup - generate with X macro */
 	switch (shader) {
 	case DAS_UFORCES:
 	case DAS_RCA_VLS:
 	case DAS_RCA_TPW:
+	case DAS_UHERCULES:
 		stream_append_byte(s, '-');
 		stream_append_u64(s, transmit_count);
 	default: break;