renamed gles to essl to match shader runtime layout

This commit is contained in:
Mathieu-Andre Chiasson
2018-12-29 20:10:24 -05:00
committed by Joshua Brookover
parent 32365cacb0
commit c5e68e3bbd
2 changed files with 9 additions and 9 deletions

View File

@@ -51,11 +51,11 @@ function( add_bgfx_shader FILE FOLDER )
list( APPEND OUTPUTS "METAL" )
set( OUTPUTS_PRETTY "${OUTPUTS_PRETTY}Metal, " )
endif()
# gles
set( GLES_OUTPUT ${BGFX_DIR}/examples/runtime/shaders/gles/${FILENAME}.bin )
shaderc_parse( GLES ${COMMON} ANDROID OUTPUT ${GLES_OUTPUT} )
list( APPEND OUTPUTS "GLES" )
set( OUTPUTS_PRETTY "${OUTPUTS_PRETTY}GLES, " )
# essl
set( ESSL_OUTPUT ${BGFX_DIR}/examples/runtime/shaders/essl/${FILENAME}.bin )
shaderc_parse( ESSL ${COMMON} ANDROID OUTPUT ${ESSL_OUTPUT} )
list( APPEND OUTPUTS "ESSL" )
set( OUTPUTS_PRETTY "${OUTPUTS_PRETTY}ESSL, " )
# glsl
set( GLSL_OUTPUT ${BGFX_DIR}/examples/runtime/shaders/glsl/${FILENAME}.bin )
shaderc_parse( GLSL ${COMMON} LINUX PROFILE 120 OUTPUT ${GLSL_OUTPUT} )

View File

@@ -47,11 +47,11 @@ function( add_shader ARG_FILE )
set( PLATFORMS ${ARG_PLATFORMS} )
else()
if( MSVC )
set( PLATFORMS dx9 dx11 glsl gles asm.js )
set( PLATFORMS dx9 dx11 glsl essl asm.js )
elseif( APPLE )
set( PLATFORMS metal glsl gles asm.js )
set( PLATFORMS metal glsl essl asm.js )
else()
set( PLATFORMS glsl gles asm.js )
set( PLATFORMS glsl essl asm.js )
endif()
endif()
@@ -107,7 +107,7 @@ function( add_shader ARG_FILE )
${GLSL_PROFILE}
OUTPUT ${OUTPUT}
)
elseif( "${PLATFORM}" STREQUAL "gles" )
elseif( "${PLATFORM}" STREQUAL "essl" )
list( APPEND OPTIONS
ANDROID
OUTPUT ${OUTPUT}