Peter M. Groen / dali-demo

Commit 15789a63a4122d73c8bb612c04a2047622d54f61

Authored by David Steele
1 parent b7cc2ee8

Updating for NativeImageInterface 

Change-Id: I02cd01111d1f1b9c9f495134eebcf9b6b69a3565
Inline Side-by-side
Showing 1 changed file with 19 additions and 27 deletions
examples/native-image-source/native-image-source-example.cpp
  View file @15789a6
... ... @@ -17,7 +17,6 @@
17 17  
18 18 // EXTERNAL INCLUDES
19 19 #include <dali/dali.h>
20   -#include <dali/devel-api/images/native-image-interface-extension.h>
21 20 #include <dali-toolkit/dali-toolkit.h>
22 21 #include <cstring>
23 22  
... ... @@ -38,10 +37,10 @@ const std::string CAPTURE_FILENAME = &quot;/tmp/native-image-capture.png&quot;;
38 37  
39 38 /**
40 39 * @brief Creates a shader used to render a native image
41   - * @param[in] nativeImageInterface The native image interface
  40 + * @param[in] nativeImage The native image
42 41 * @return A shader to render the native image
43 42 */
44   -Shader CreateShader( NativeImageInterface& nativeImageInterface )
  43 +Shader CreateShader( NativeImageInterface& nativeImage )
45 44 {
46 45 static const char* DEFAULT_SAMPLER_TYPENAME = "sampler2D";
47 46  
... ... @@ -70,36 +69,29 @@ Shader CreateShader( NativeImageInterface&amp; nativeImageInterface )
70 69 }\n
71 70 );
72 71  
73   - NativeImageInterface::Extension* extension( nativeImageInterface.GetExtension() );
74   - if( extension )
75   - {
76   - std::string fragmentShader;
77   -
78   - //Get custom fragment shader prefix
79   - const char* fragmentPreFix = extension->GetCustomFragmentPreFix();
80   - if( fragmentPreFix )
81   - {
82   - fragmentShader = fragmentPreFix;
83   - fragmentShader += FRAGMENT_SHADER_TEXTURE;
84   - }
85   - else
86   - {
87   - fragmentShader = FRAGMENT_SHADER_TEXTURE;
88   - }
89 72  
90   - //Get custom sampler type name
91   - const char* customSamplerTypename = extension->GetCustomSamplerTypename();
92   - if( customSamplerTypename )
93   - {
94   - fragmentShader.replace( fragmentShader.find( DEFAULT_SAMPLER_TYPENAME ), strlen(DEFAULT_SAMPLER_TYPENAME), customSamplerTypename );
95   - }
  73 + std::string fragmentShader;
96 74  
97   - return Shader::New( VERTEX_SHADER_TEXTURE, fragmentShader );
  75 + //Get custom fragment shader prefix
  76 + const char* fragmentPrefix = nativeImage.GetCustomFragmentPrefix();
  77 + if( fragmentPrefix )
  78 + {
  79 + fragmentShader = fragmentPrefix;
  80 + fragmentShader += FRAGMENT_SHADER_TEXTURE;
98 81 }
99 82 else
100 83 {
101   - return Shader::New( VERTEX_SHADER_TEXTURE, FRAGMENT_SHADER_TEXTURE );
  84 + fragmentShader = FRAGMENT_SHADER_TEXTURE;
102 85 }
  86 +
  87 + //Get custom sampler type name
  88 + const char* customSamplerTypename = nativeImage.GetCustomSamplerTypename();
  89 + if( customSamplerTypename )
  90 + {
  91 + fragmentShader.replace( fragmentShader.find( DEFAULT_SAMPLER_TYPENAME ), strlen(DEFAULT_SAMPLER_TYPENAME), customSamplerTypename );
  92 + }
  93 +
  94 + return Shader::New( VERTEX_SHADER_TEXTURE, fragmentShader );
103 95 }
104 96  
105 97 }
... ...