AI/rocm-systems
2
0
Fork 0
Código Incidencias Pull Requests Acciones Paquetes Proyectos Lanzamientos Wiki Actividad

P4 to Git Change 1135960 by lujiao@lujiao_win_ugl on 2015/03/30 21:31:30

Explorar el Código 
EPR #410381 - [OGL] Implement GL_KHR_texture_compression_astc_ldr
	Add new formats in the cm_enum.h for the astc new tokens

	    COMPRESSED_RGBA_ASTC_4x4_KHR            0x93B0
	    COMPRESSED_RGBA_ASTC_5x4_KHR            0x93B1
	    COMPRESSED_RGBA_ASTC_5x5_KHR            0x93B2
	    COMPRESSED_RGBA_ASTC_6x5_KHR            0x93B3
	    COMPRESSED_RGBA_ASTC_6x6_KHR            0x93B4
	    COMPRESSED_RGBA_ASTC_8x5_KHR            0x93B5
	    COMPRESSED_RGBA_ASTC_8x6_KHR            0x93B6
	    COMPRESSED_RGBA_ASTC_8x8_KHR            0x93B7
	    COMPRESSED_RGBA_ASTC_10x5_KHR           0x93B8
	    COMPRESSED_RGBA_ASTC_10x6_KHR           0x93B9
	    COMPRESSED_RGBA_ASTC_10x8_KHR           0x93BA
	    COMPRESSED_RGBA_ASTC_10x10_KHR          0x93BB
	    COMPRESSED_RGBA_ASTC_12x10_KHR          0x93BC
	    COMPRESSED_RGBA_ASTC_12x12_KHR          0x93BD

	    COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR    0x93D0
	    COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR    0x93D1
	    COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR    0x93D2
	    COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR    0x93D3
	    COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR    0x93D4
	    COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR    0x93D5
	    COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR    0x93D6
	    COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR    0x93D7
	    COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR   0x93D8
	    COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR   0x93D9
	    COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR   0x93DA
	    COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR  0x93DB
	    COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR  0x93DC
	    COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR  0x93DD

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/7161/diff/
	http://ocltc.amd.com:8111/viewModification.html?modId=49135&personal=true

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp#21 edit


[ROCm/clr commit: c465e50702]
Este commit está contenido en:
foreman
2015-03-30 21:44:08 -04:00
padre de03baafbf
commit 589f106930
Se han modificado 1 ficheros con 68 adiciones y 10 borrados
Descargar archivo de parche Descargar archivo de diferencias Expandir todos los archivos Contraer todos los archivos
projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp
+68 -10
Ver fichero
@@ -196,6 +196,35 @@ static const cmFormatXlateParams cmFormatXlateTable [] = {
{CM_SURF_FMT_SIGNED_R11_EAC, (cmSurfFmt)500, GSL_CHANNEL_ORDER_R},
{CM_SURF_FMT_RG11_EAC, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RG},
{CM_SURF_FMT_SIGNED_RG11_EAC, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RG},
{CM_SURF_FMT_RGBA8_ASTC_4x4, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_5x4, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_5x5, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_6x5, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_6x6, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_8x5, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_8x6, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_8x8, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_10x5, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_10x6, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_10x8, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_10x10, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_12x10, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_RGBA8_ASTC_12x12, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_4x4, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_5x4, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_5x5, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_6x5, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_6x6, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_8x5, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_8x6, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_8x8, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_10x5, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_10x6, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_10x8, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_10x10, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_12x10, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_SRGBA8_ASTC_12x12, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA},
{CM_SURF_FMT_BGR10_A2UI, (cmSurfFmt)501, GSL_CHANNEL_ORDER_BGRA},
{CM_SURF_FMT_A2_BGR10UI, (cmSurfFmt)501, GSL_CHANNEL_ORDER_ARGB},
{CM_SURF_FMT_A2_RGB10UI, (cmSurfFmt)501, GSL_CHANNEL_ORDER_ABGR},
@@ -399,16 +428,45 @@ dummyAssertIfCmSurfFmtChanges(void)
COMPILE_TIME_ASSERT(181 == CM_SURF_FMT_SIGNED_R11_EAC);
COMPILE_TIME_ASSERT(182 == CM_SURF_FMT_RG11_EAC);
COMPILE_TIME_ASSERT(183 == CM_SURF_FMT_SIGNED_RG11_EAC);
COMPILE_TIME_ASSERT(184 == CM_SURF_FMT_BGR10_A2UI);
COMPILE_TIME_ASSERT(185 == CM_SURF_FMT_A2_BGR10UI);
COMPILE_TIME_ASSERT(186 == CM_SURF_FMT_A2_RGB10UI);
COMPILE_TIME_ASSERT(187 == CM_SURF_FMT_B5_G6_R5UI);
COMPILE_TIME_ASSERT(188 == CM_SURF_FMT_R5_G6_B5UI);
COMPILE_TIME_ASSERT(189 == CM_SURF_FMT_DEPTH32F_X24_STEN8_UNCLAMPED);
COMPILE_TIME_ASSERT(190 == CM_SURF_FMT_DEPTH32F_UNCLAMPED);
COMPILE_TIME_ASSERT(191 == CM_SURF_FMT_L8_X16_A8_SRGB);
COMPILE_TIME_ASSERT(192 == CM_SURF_FMT_L8_X24_SRGB);
COMPILE_TIME_ASSERT(193 == CM_SURF_FMT_STENCIL8);
COMPILE_TIME_ASSERT(184 == CM_SURF_FMT_RGBA8_ASTC_4x4);
COMPILE_TIME_ASSERT(185 == CM_SURF_FMT_RGBA8_ASTC_5x4);
COMPILE_TIME_ASSERT(186 == CM_SURF_FMT_RGBA8_ASTC_5x5);
COMPILE_TIME_ASSERT(187 == CM_SURF_FMT_RGBA8_ASTC_6x5);
COMPILE_TIME_ASSERT(188 == CM_SURF_FMT_RGBA8_ASTC_6x6);
COMPILE_TIME_ASSERT(189 == CM_SURF_FMT_RGBA8_ASTC_8x5);
COMPILE_TIME_ASSERT(190 == CM_SURF_FMT_RGBA8_ASTC_8x6);
COMPILE_TIME_ASSERT(191 == CM_SURF_FMT_RGBA8_ASTC_8x8);
COMPILE_TIME_ASSERT(192 == CM_SURF_FMT_RGBA8_ASTC_10x5);
COMPILE_TIME_ASSERT(193 == CM_SURF_FMT_RGBA8_ASTC_10x6);
COMPILE_TIME_ASSERT(194 == CM_SURF_FMT_RGBA8_ASTC_10x8);
COMPILE_TIME_ASSERT(195 == CM_SURF_FMT_RGBA8_ASTC_10x10);
COMPILE_TIME_ASSERT(196 == CM_SURF_FMT_RGBA8_ASTC_12x10);
COMPILE_TIME_ASSERT(197 == CM_SURF_FMT_RGBA8_ASTC_12x12);
COMPILE_TIME_ASSERT(198 == CM_SURF_FMT_SRGBA8_ASTC_4x4);
COMPILE_TIME_ASSERT(199 == CM_SURF_FMT_SRGBA8_ASTC_5x4);
COMPILE_TIME_ASSERT(200 == CM_SURF_FMT_SRGBA8_ASTC_5x5);
COMPILE_TIME_ASSERT(201 == CM_SURF_FMT_SRGBA8_ASTC_6x5);
COMPILE_TIME_ASSERT(202 == CM_SURF_FMT_SRGBA8_ASTC_6x6);
COMPILE_TIME_ASSERT(203 == CM_SURF_FMT_SRGBA8_ASTC_8x5);
COMPILE_TIME_ASSERT(204 == CM_SURF_FMT_SRGBA8_ASTC_8x6);
COMPILE_TIME_ASSERT(205 == CM_SURF_FMT_SRGBA8_ASTC_8x8);
COMPILE_TIME_ASSERT(206 == CM_SURF_FMT_SRGBA8_ASTC_10x5);
COMPILE_TIME_ASSERT(207 == CM_SURF_FMT_SRGBA8_ASTC_10x6);
COMPILE_TIME_ASSERT(208 == CM_SURF_FMT_SRGBA8_ASTC_10x8);
COMPILE_TIME_ASSERT(209 == CM_SURF_FMT_SRGBA8_ASTC_10x10);
COMPILE_TIME_ASSERT(210 == CM_SURF_FMT_SRGBA8_ASTC_12x10);
COMPILE_TIME_ASSERT(211 == CM_SURF_FMT_SRGBA8_ASTC_12x12);
COMPILE_TIME_ASSERT(212 == CM_SURF_FMT_BGR10_A2UI);
COMPILE_TIME_ASSERT(213 == CM_SURF_FMT_A2_BGR10UI);
COMPILE_TIME_ASSERT(214 == CM_SURF_FMT_A2_RGB10UI);
COMPILE_TIME_ASSERT(215 == CM_SURF_FMT_B5_G6_R5UI);
COMPILE_TIME_ASSERT(216 == CM_SURF_FMT_R5_G6_B5UI);
COMPILE_TIME_ASSERT(217 == CM_SURF_FMT_DEPTH32F_X24_STEN8_UNCLAMPED);
COMPILE_TIME_ASSERT(218 == CM_SURF_FMT_DEPTH32F_UNCLAMPED);
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(cmSurfFmt_LAST == CM_SURF_FMT_STENCIL8);
COMPILE_TIME_ASSERT(cmSurfFmt_LAST < 501);