Peter M. Groen / dali-demo

Commit dddea0a18d80e6b4a8e446d381823ad8834ea19e

Authored by Seungho BAEK
Committed by Gerrit Code Review
2 parents ca49b3e4 2824e65c

Merge "Add ApplyCustomFragmentPrefix" into devel/master

Inline Side-by-side
Showing 1 changed file with 2 additions and 19 deletions
examples/native-image-source/native-image-source-example.cpp
  View file @dddea0a
... ... @@ -43,28 +43,11 @@ const std::string CAPTURE_FILENAME = DEMO_DATA_PUBLIC_RW_DIR "native-image-captu
43 43 */
44 44 Shader CreateShader(NativeImageInterface& nativeImage)
45 45 {
46   - static const char* DEFAULT_SAMPLER_TYPENAME = "sampler2D";
47   -
48 46 std::string fragmentShader;
49 47  
50 48 //Get custom fragment shader prefix
51   - const char* fragmentPrefix = nativeImage.GetCustomFragmentPrefix();
52   - if(fragmentPrefix)
53   - {
54   - fragmentShader = fragmentPrefix;
55   - fragmentShader += SHADER_NATIVE_IMAGE_SOURCE_TEXTURE_FRAG.data();
56   - }
57   - else
58   - {
59   - fragmentShader = SHADER_NATIVE_IMAGE_SOURCE_TEXTURE_FRAG.data();
60   - }
61   -
62   - //Get custom sampler type name
63   - const char* customSamplerTypename = nativeImage.GetCustomSamplerTypename();
64   - if(customSamplerTypename)
65   - {
66   - fragmentShader.replace(fragmentShader.find(DEFAULT_SAMPLER_TYPENAME), strlen(DEFAULT_SAMPLER_TYPENAME), customSamplerTypename);
67   - }
  49 + fragmentShader = SHADER_NATIVE_IMAGE_SOURCE_TEXTURE_FRAG.data();
  50 + nativeImage.ApplyNativeFragmentShader(fragmentShader);
68 51  
69 52 return Shader::New(SHADER_NATIVE_IMAGE_SOURCE_TEXTURE_VERT, fragmentShader);
70 53 }
... ...