diff --git a/mediapipe/gpu/BUILD b/mediapipe/gpu/BUILD
index b75c824b3..f39b8d3f7 100644
--- a/mediapipe/gpu/BUILD
+++ b/mediapipe/gpu/BUILD
@@ -516,6 +516,7 @@ cc_library(
         ":gpu_buffer_storage",
         ":image_frame_view",
         "//mediapipe/framework/formats:image_frame",
+        "//mediapipe/framework/port:ret_check",
         "@com_google_absl//absl/strings:str_format",
     ],
 )
@@ -1223,9 +1224,13 @@ mediapipe_cc_test(
     ],
     requires_full_emulation = True,
     deps = [
+        ":gl_texture_buffer",
+        ":gl_texture_util",
         ":gpu_buffer_format",
         ":gpu_buffer_storage_ahwb",
+        ":gpu_test_base",
         "//mediapipe/framework/port:gtest_main",
+        "//mediapipe/framework/tool:test_util",
     ],
 )
 
diff --git a/mediapipe/gpu/gpu_buffer_format.cc b/mediapipe/gpu/gpu_buffer_format.cc
index b099f4a25..510a9cd48 100644
--- a/mediapipe/gpu/gpu_buffer_format.cc
+++ b/mediapipe/gpu/gpu_buffer_format.cc
@@ -238,7 +238,7 @@ ImageFormat::Format ImageFormatForGpuBufferFormat(GpuBufferFormat format) {
     case GpuBufferFormat::kRGBAFloat128:
       return ImageFormat::VEC32F4;
     case GpuBufferFormat::kRGBA32:
-      // TODO: this likely maps to ImageFormat::SRGBA
+      return ImageFormat::SRGBA;
     case GpuBufferFormat::kGrayHalf16:
     case GpuBufferFormat::kOneComponent8Alpha:
     case GpuBufferFormat::kOneComponent8Red: