Merge branch 'master' into pr/1875

2022-04-15 13:24:23 -07:00
parent 6464bdfd68 95aa3249d0
commit 97a210f14b
268 changed files with 73441 additions and 2576 deletions
@@ -223,7 +223,7 @@ bool Renderer::GetColorContext(ColorProcessorPtr color_processor, Renderer::Colo
    // Create shader description
    const char* ocio_func_name = "OCIODisplay";
    auto shader_desc = OCIO::GpuShaderDesc::CreateShaderDesc();
-    shader_desc->setLanguage(OCIO::GPU_LANGUAGE_GLSL_1_3);
+    shader_desc->setLanguage(OCIO::GPU_LANGUAGE_GLSL_ES_3_0);
    shader_desc->setFunctionName(ocio_func_name);
    shader_desc->setResourcePrefix("ocio_");