diff --git a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp
index 6c3ad49e37..0567fac016 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp
@@ -237,6 +237,9 @@ static const   cmFormatXlateParams cmFormatXlateTable [] = {
     {CM_SURF_FMT_L8_X16_A8_SRGB,         (cmSurfFmt)500,        GSL_CHANNEL_ORDER_RGBA},
     {CM_SURF_FMT_L8_X24_SRGB,            (cmSurfFmt)500,        GSL_CHANNEL_ORDER_RGBA},
     {CM_SURF_FMT_STENCIL8,               CM_SURF_FMT_R8I,       GSL_CHANNEL_ORDER_R},
+    {CM_SURF_FMT_L8_SRGB,                (cmSurfFmt)500,        GSL_CHANNEL_ORDER_R},
+    {CM_SURF_FMT_R8_SRGB,                (cmSurfFmt)500,        GSL_CHANNEL_ORDER_R},
+    {CM_SURF_FMT_RG8_SRGB,               (cmSurfFmt)500,        GSL_CHANNEL_ORDER_RG},
     };
 
 FINLINE void
@@ -469,6 +472,9 @@ dummyAssertIfCmSurfFmtChanges(void)
     COMPILE_TIME_ASSERT(219 == CM_SURF_FMT_L8_X16_A8_SRGB);
     COMPILE_TIME_ASSERT(220 == CM_SURF_FMT_L8_X24_SRGB);
     COMPILE_TIME_ASSERT(221 == CM_SURF_FMT_STENCIL8);
+    COMPILE_TIME_ASSERT(222 == CM_SURF_FMT_L8_SRGB);
+    COMPILE_TIME_ASSERT(223 == CM_SURF_FMT_R8_SRGB);
+    COMPILE_TIME_ASSERT(224 == CM_SURF_FMT_RG8_SRGB);
 #else
     COMPILE_TIME_ASSERT(126 == CM_SURF_FMT_sRGBX32I);
     COMPILE_TIME_ASSERT(127 == CM_SURF_FMT_sALPHA32I);
@@ -565,8 +571,11 @@ dummyAssertIfCmSurfFmtChanges(void)
     COMPILE_TIME_ASSERT(218 == CM_SURF_FMT_L8_X16_A8_SRGB);
     COMPILE_TIME_ASSERT(219 == CM_SURF_FMT_L8_X24_SRGB);
     COMPILE_TIME_ASSERT(220 == CM_SURF_FMT_STENCIL8);
+    COMPILE_TIME_ASSERT(221 == CM_SURF_FMT_L8_SRGB);
+    COMPILE_TIME_ASSERT(222 == CM_SURF_FMT_R8_SRGB);
+    COMPILE_TIME_ASSERT(223 == CM_SURF_FMT_RG8_SRGB);
 #endif
-    COMPILE_TIME_ASSERT(cmSurfFmt_LAST  == CM_SURF_FMT_STENCIL8);
+    COMPILE_TIME_ASSERT(cmSurfFmt_LAST  == CM_SURF_FMT_RG8_SRGB);
     COMPILE_TIME_ASSERT(cmSurfFmt_LAST < 501);
 }