#include "../../stdafx.h"\r
\r
#include "image_kernel.h"\r
+\r
+#include "image_shader.h"\r
+\r
#include "blending_glsl.h"\r
#include "../gpu/shader.h"\r
#include "../gpu/device_buffer.h"\r
+#include "../gpu/ogl_device.h"\r
\r
#include <common/exception/exceptions.h>\r
#include <common/gl/gl_check.h>\r
+#include <common/env.h>\r
\r
#include <core/video_format.h>\r
#include <core/producer/frame/pixel_format.h>\r
-#include <core/producer/frame/image_transform.h>\r
+#include <core/producer/frame/frame_transform.h>\r
+\r
+#include <GL/glew.h>\r
\r
#include <boost/noncopyable.hpp>\r
\r
\r
namespace caspar { namespace core {\r
\r
+GLubyte upper_pattern[] = {\r
+ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,\r
+ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,\r
+ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,\r
+ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00};\r
+ \r
+GLubyte lower_pattern[] = {\r
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, \r
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,\r
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,\r
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff};\r
+\r
struct image_kernel::implementation : boost::noncopyable\r
{ \r
- std::unique_ptr<shader> shader_;\r
- \r
- implementation()\r
+ std::shared_ptr<shader> shader_;\r
+ bool blend_modes_;\r
+ \r
+ void draw(ogl_device& ogl, draw_params&& params)\r
{\r
- std::string vertex = \r
- "void main() \n"\r
- "{ \n"\r
- " gl_TexCoord[0] = gl_MultiTexCoord0; \n"\r
- " gl_TexCoord[1] = gl_MultiTexCoord1; \n"\r
- " gl_FrontColor = gl_Color; \n"\r
- " gl_Position = ftransform(); \n"\r
- "} \n";\r
-\r
- std::string fragment = std::string() +\r
- "uniform sampler2D background; \n"\r
- "uniform sampler2D plane[4]; \n"\r
- "uniform sampler2D local_key; \n"\r
- "uniform sampler2D layer_key; \n"\r
- " \n"\r
- "uniform bool is_hd; \n"\r
- "uniform bool has_local_key; \n"\r
- "uniform bool has_layer_key; \n"\r
- "uniform int blend_mode; \n"\r
- "uniform int alpha_mode; \n"\r
- "uniform int interlace_mode; \n"\r
- "uniform int pixel_format; \n"\r
- " \n"\r
- "uniform float gain; \n"\r
- " \n"\r
- "uniform bool levels; \n"\r
- "uniform float min_input; \n"\r
- "uniform float max_input; \n"\r
- "uniform float gamma; \n"\r
- "uniform float min_output; \n"\r
- "uniform float max_output; \n"\r
- " \n"\r
- "uniform bool csb; \n"\r
- "uniform float brt; \n"\r
- "uniform float sat; \n"\r
- "uniform float con; \n"\r
- " \n"\r
-\r
- +\r
-\r
- get_blend_glsl()\r
- \r
- +\r
-\r
- "vec3 get_blend_color(vec3 back, vec3 fore) \n"\r
- "{ \n"\r
- " switch(blend_mode) \n"\r
- " { \n"\r
- " case 0: return BlendNormal(back, fore); \n"\r
- " case 1: return BlendLighten(back, fore); \n"\r
- " case 2: return BlendDarken(back, fore); \n"\r
- " case 3: return BlendMultiply(back, fore); \n"\r
- " case 4: return BlendAverage(back, fore); \n"\r
- " case 5: return BlendAdd(back, fore); \n"\r
- " case 6: return BlendSubstract(back, fore); \n"\r
- " case 7: return BlendDifference(back, fore); \n"\r
- " case 8: return BlendNegation(back, fore); \n"\r
- " case 9: return BlendExclusion(back, fore); \n"\r
- " case 10: return BlendScreen(back, fore); \n"\r
- " case 11: return BlendOverlay(back, fore); \n"\r
- //" case 12: return BlendSoftLight(back, fore); \n"\r
- " case 13: return BlendHardLight(back, fore); \n"\r
- " case 14: return BlendColorDodge(back, fore); \n"\r
- " case 15: return BlendColorBurn(back, fore); \n"\r
- " case 16: return BlendLinearDodge(back, fore); \n"\r
- " case 17: return BlendLinearBurn(back, fore); \n"\r
- " case 18: return BlendLinearLight(back, fore); \n"\r
- " case 19: return BlendVividLight(back, fore); \n"\r
- " case 20: return BlendPinLight(back, fore); \n"\r
- " case 21: return BlendHardMix(back, fore); \n"\r
- " case 22: return BlendReflect(back, fore); \n"\r
- " case 23: return BlendGlow(back, fore); \n"\r
- " case 24: return BlendPhoenix(back, fore); \n"\r
- " case 25: return BlendHue(back, fore); \n"\r
- " case 26: return BlendSaturation(back, fore); \n"\r
- " case 27: return BlendColor(back, fore); \n"\r
- " case 28: return BlendLuminosity(back, fore); \n"\r
- " } \n"\r
- " \n"\r
- " return BlendNormal(back, fore); \n"\r
- "} \n"\r
- " \n" \r
- "vec4 blend_color(vec4 fore) \n"\r
- "{ \n"\r
- " vec4 back = texture2D(background, gl_TexCoord[1].st); \n"\r
- " if(levels) \n"\r
- " fore.rgb = LevelsControl(fore.rgb, min_input, max_input, gamma, min_output, max_output); \n"\r
- " if(csb) \n"\r
- " fore.rgb = ContrastSaturationBrightness(fore.rgb, brt, sat, con); \n"\r
- " fore.rgb = get_blend_color(back.bgr, fore.rgb); \n"\r
- " \n"\r
- " return vec4(fore.rgb * fore.a + back.rgb * (1.0-fore.a), back.a + fore.a); \n"\r
- "} \n"\r
- " \n"\r
- "// NOTE: YCbCr, ITU-R, http://www.intersil.com/data/an/an9717.pdf \n"\r
- "// TODO: Support for more yuv formats might be needed. \n"\r
- "vec4 ycbcra_to_rgba_sd(float y, float cb, float cr, float a) \n"\r
- "{ \n"\r
- " cb -= 0.5; \n"\r
- " cr -= 0.5; \n"\r
- " y = 1.164*(y-0.0625); \n"\r
- " \n"\r
- " vec4 color; \n"\r
- " color.r = y + 2.018 * cb; \n"\r
- " color.b = y + 1.596 * cr; \n"\r
- " color.g = y - 0.813 * cr - 0.391 * cb; \n"\r
- " color.a = a; \n"\r
- " \n"\r
- " return color; \n"\r
- "} \n" \r
- " \n"\r
- "vec4 ycbcra_to_rgba_hd(float y, float cb, float cr, float a) \n"\r
- "{ \n"\r
- " cb -= 0.5; \n"\r
- " cr -= 0.5; \n"\r
- " y = 1.164*(y-0.0625); \n"\r
- " \n"\r
- " vec4 color; \n"\r
- " color.r = y + 2.115 * cb; \n"\r
- " color.b = y + 1.793 * cr; \n"\r
- " color.g = y - 0.534 * cr - 0.213 * cb; \n"\r
- " color.a = a; \n"\r
- " \n"\r
- " return color; \n"\r
- "} \n" \r
- " \n" \r
- "vec4 ycbcra_to_rgba(float y, float cb, float cr, float a) \n"\r
- "{ \n"\r
- " if(is_hd) \n"\r
- " return ycbcra_to_rgba_hd(y, cb, cr, a); \n"\r
- " else \n"\r
- " return ycbcra_to_rgba_sd(y, cb, cr, a); \n"\r
- "} \n"\r
- " \n"\r
- "vec4 get_rgba_color() \n"\r
- "{ \n"\r
- " switch(pixel_format) \n"\r
- " { \n"\r
- " case 0: //gray \n"\r
- " return vec4(texture2D(plane[0], gl_TexCoord[0].st).rrr, 1.0); \n"\r
- " case 1: //bgra, \n"\r
- " return texture2D(plane[0], gl_TexCoord[0].st).bgra; \n"\r
- " case 2: //rgba, \n"\r
- " return texture2D(plane[0], gl_TexCoord[0].st).rgba; \n"\r
- " case 3: //argb, \n"\r
- " return texture2D(plane[0], gl_TexCoord[0].st).argb; \n"\r
- " case 4: //abgr, \n"\r
- " return texture2D(plane[0], gl_TexCoord[0].st).gbar; \n"\r
- " case 5: //ycbcr, \n"\r
- " { \n"\r
- " float y = texture2D(plane[0], gl_TexCoord[0].st).r; \n"\r
- " float cb = texture2D(plane[1], gl_TexCoord[0].st).r; \n"\r
- " float cr = texture2D(plane[2], gl_TexCoord[0].st).r; \n"\r
- " return ycbcra_to_rgba(y, cb, cr, 1.0); \n"\r
- " } \n"\r
- " case 6: //ycbcra \n"\r
- " { \n"\r
- " float y = texture2D(plane[0], gl_TexCoord[0].st).r; \n"\r
- " float cb = texture2D(plane[1], gl_TexCoord[0].st).r; \n"\r
- " float cr = texture2D(plane[2], gl_TexCoord[0].st).r; \n"\r
- " float a = texture2D(plane[3], gl_TexCoord[0].st).r; \n"\r
- " return ycbcra_to_rgba(y, cb, cr, a); \n"\r
- " } \n"\r
- " } \n"\r
- " return vec4(0.0, 0.0, 0.0, 0.0); \n"\r
- "} \n"\r
- " \n"\r
- "void main() \n"\r
- "{ \n"\r
- " switch(interlace_mode) \n"\r
- " { \n"\r
- " case 1: // lower \n"\r
- " { \n"\r
- " bool odd = mod(floor(gl_FragCoord.y), 2.0) > 0.5; \n"\r
- " if(!odd) \n"\r
- " discard; \n"\r
- " break; \n"\r
- " } \n"\r
- " case 2: //upper \n"\r
- " { \n"\r
- " bool odd = mod(floor(gl_FragCoord.y), 2.0) > 0.5; \n"\r
- " if(odd) \n"\r
- " discard; \n"\r
- " break; \n"\r
- " } \n"\r
- " } \n"\r
- " \n"\r
- " vec4 color = get_rgba_color(); \n"\r
- " if(has_local_key) \n"\r
- " color.a *= texture2D(local_key, gl_TexCoord[1].st).r; \n"\r
- " if(has_layer_key) \n"\r
- " color.a *= texture2D(layer_key, gl_TexCoord[1].st).r; \n"\r
- " gl_FragColor = blend_color(color.bgra * gl_Color * gain); \n"\r
- "} \n"\r
- ;\r
-\r
- shader_.reset(new shader(vertex, fragment));\r
- }\r
+ static const double epsilon = 0.001;\r
\r
- \r
- void draw(size_t width, \r
- size_t height, \r
- const core::pixel_format_desc& pix_desc, \r
- const core::image_transform& transform, \r
- const std::vector<safe_ptr<device_buffer>>& planes, \r
- const safe_ptr<device_buffer>& background,\r
- const std::shared_ptr<device_buffer>& local_key, \r
- const std::shared_ptr<device_buffer>& layer_key)\r
- {\r
- GL(glEnable(GL_TEXTURE_2D));\r
- \r
- // Setup depth for interlacing and explicit z-culling\r
- double z = 0.0;\r
- if(transform.get_mode() == core::video_mode::upper)\r
- { \r
- GL(glEnable(GL_DEPTH_TEST)); \r
- z = 1.0;\r
- }\r
- else if(transform.get_mode() == core::video_mode::lower)\r
- GL(glClear(GL_DEPTH_BUFFER_BIT)); \r
+ CASPAR_ASSERT(params.pix_desc.planes.size() == params.textures.size());\r
\r
+ if(params.textures.empty() || !params.background)\r
+ return;\r
+\r
+ if(params.transform.opacity < epsilon)\r
+ return;\r
+ \r
+ if(!std::all_of(params.textures.begin(), params.textures.end(), std::mem_fn(&device_buffer::ready)))\r
+ {\r
+ CASPAR_LOG(warning) << L"[image_mixer] Performance warning. Host to device transfer not complete, GPU will be stalled";\r
+ ogl.yield(); // Try to give it some more time.\r
+ } \r
+ \r
// Bind textures\r
\r
- for(size_t n = 0; n < planes.size(); ++n)\r
- planes[n]->bind(n);\r
+ for(size_t n = 0; n < params.textures.size(); ++n)\r
+ params.textures[n]->bind(n);\r
+\r
+ if(params.local_key)\r
+ params.local_key->bind(texture_id::local_key);\r
+ \r
+ if(params.layer_key)\r
+ params.layer_key->bind(texture_id::layer_key);\r
+ \r
+ // Setup shader\r
\r
- if(local_key)\r
- local_key->bind(4);\r
+ if(!shader_)\r
+ shader_ = get_image_shader(ogl, blend_modes_);\r
+ \r
+ ogl.use(*shader_);\r
+\r
+ shader_->set("plane[0]", texture_id::plane0);\r
+ shader_->set("plane[1]", texture_id::plane1);\r
+ shader_->set("plane[2]", texture_id::plane2);\r
+ shader_->set("plane[3]", texture_id::plane3);\r
+ shader_->set("local_key", texture_id::local_key);\r
+ shader_->set("layer_key", texture_id::layer_key);\r
+ shader_->set("is_hd", params.pix_desc.planes.at(0).height > 700 ? 1 : 0);\r
+ shader_->set("has_local_key", params.local_key);\r
+ shader_->set("has_layer_key", params.layer_key);\r
+ shader_->set("pixel_format", params.pix_desc.pix_fmt); \r
+ shader_->set("opacity", params.transform.is_key ? 1.0 : params.transform.opacity); \r
\r
- if(layer_key)\r
- layer_key->bind(5);\r
+ // Setup blend_func\r
+ \r
+ if(params.transform.is_key)\r
+ params.blend_mode = blend_mode::normal;\r
\r
- background->bind(6);\r
+ if(blend_modes_)\r
+ {\r
+ params.background->bind(6);\r
\r
- // Setup shader\r
+ shader_->set("background", texture_id::background);\r
+ shader_->set("blend_mode", params.blend_mode);\r
+ shader_->set("keyer", params.keyer);\r
+ }\r
+ else\r
+ {\r
+ switch(params.keyer)\r
+ {\r
+ case keyer::additive:\r
+ ogl.blend_func(GL_ONE, GL_ONE); \r
+ break;\r
+ case keyer::linear:\r
+ default: \r
+ ogl.blend_func(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); \r
+ } \r
+ }\r
\r
- shader_->use(); \r
-\r
- shader_->set("plane[0]", 0);\r
- shader_->set("plane[1]", 1);\r
- shader_->set("plane[2]", 2);\r
- shader_->set("plane[3]", 3);\r
- shader_->set("local_key", 4);\r
- shader_->set("layer_key", 5);\r
- shader_->set("background", 6);\r
- shader_->set("gain", transform.get_gain());\r
- shader_->set("is_hd", pix_desc.planes.at(0).height > 700 ? 1 : 0);\r
- shader_->set("has_local_key", local_key ? 1 : 0);\r
- shader_->set("has_layer_key", layer_key ? 1 : 0);\r
- shader_->set("blend_mode", transform.get_blend_mode());\r
- shader_->set("alpha_mode", transform.get_alpha_mode());\r
- shader_->set("interlace_mode", transform.get_mode());\r
- shader_->set("pixel_format", pix_desc.pix_fmt); \r
-\r
- auto levels = transform.get_levels();\r
-\r
- if(levels.min_input > 0.001 ||\r
- levels.max_input < 0.999 ||\r
- levels.min_output > 0.001 ||\r
- levels.max_output < 0.999 ||\r
- std::abs(levels.gamma - 1.0) > 0.001)\r
+ // Setup image-adjustements\r
+ \r
+ if(params.transform.levels.min_input > epsilon ||\r
+ params.transform.levels.max_input < 1.0-epsilon ||\r
+ params.transform.levels.min_output > epsilon ||\r
+ params.transform.levels.max_output < 1.0-epsilon ||\r
+ std::abs(params.transform.levels.gamma - 1.0) > epsilon)\r
{\r
shader_->set("levels", true); \r
- shader_->set("min_input", levels.min_input); \r
- shader_->set("max_input", levels.max_input);\r
- shader_->set("min_output", levels.min_output);\r
- shader_->set("max_output", levels.max_output);\r
- shader_->set("gamma", levels.gamma);\r
+ shader_->set("min_input", params.transform.levels.min_input); \r
+ shader_->set("max_input", params.transform.levels.max_input);\r
+ shader_->set("min_output", params.transform.levels.min_output);\r
+ shader_->set("max_output", params.transform.levels.max_output);\r
+ shader_->set("gamma", params.transform.levels.gamma);\r
}\r
else\r
shader_->set("levels", false); \r
\r
- if(std::abs(transform.get_brightness() - 1.0) > 0.001 ||\r
- std::abs(transform.get_saturation() - 1.0) > 0.001 ||\r
- std::abs(transform.get_contrast() - 1.0) > 0.001)\r
+ if(std::abs(params.transform.brightness - 1.0) > epsilon ||\r
+ std::abs(params.transform.saturation - 1.0) > epsilon ||\r
+ std::abs(params.transform.contrast - 1.0) > epsilon)\r
{\r
shader_->set("csb", true); \r
\r
- shader_->set("brt", transform.get_brightness()); \r
- shader_->set("sat", transform.get_saturation());\r
- shader_->set("con", transform.get_contrast());\r
+ shader_->set("brt", params.transform.brightness); \r
+ shader_->set("sat", params.transform.saturation);\r
+ shader_->set("con", params.transform.contrast);\r
}\r
else\r
shader_->set("csb", false); \r
\r
+ // Setup interlacing\r
+\r
+ if(params.transform.field_mode == core::field_mode::progressive) \r
+ ogl.disable(GL_POLYGON_STIPPLE); \r
+ else \r
+ {\r
+ ogl.enable(GL_POLYGON_STIPPLE);\r
+\r
+ if(params.transform.field_mode == core::field_mode::upper)\r
+ ogl.stipple_pattern(upper_pattern);\r
+ else if(params.transform.field_mode == core::field_mode::lower)\r
+ ogl.stipple_pattern(lower_pattern);\r
+ }\r
+\r
// Setup drawing area\r
+ \r
+ ogl.viewport(0, 0, params.background->width(), params.background->height());\r
+ \r
+ auto m_p = params.transform.clip_translation;\r
+ auto m_s = params.transform.clip_scale;\r
\r
- GL(glColor4d(1.0, 1.0, 1.0, transform.get_opacity()));\r
- GL(glViewport(0, 0, width, height));\r
- \r
- auto m_p = transform.get_clip_translation();\r
- auto m_s = transform.get_clip_scale();\r
- double w = static_cast<double>(width);\r
- double h = static_cast<double>(height);\r
+ bool scissor = m_p[0] > std::numeric_limits<double>::epsilon() || m_p[1] > std::numeric_limits<double>::epsilon() ||\r
+ m_s[0] < (1.0 - std::numeric_limits<double>::epsilon()) || m_s[1] < (1.0 - std::numeric_limits<double>::epsilon());\r
\r
- GL(glEnable(GL_SCISSOR_TEST));\r
- GL(glScissor(static_cast<size_t>(m_p[0]*w), static_cast<size_t>(m_p[1]*h), static_cast<size_t>(m_s[0]*w), static_cast<size_t>(m_s[1]*h)));\r
- \r
- auto f_p = transform.get_fill_translation();\r
- auto f_s = transform.get_fill_scale();\r
+ if(scissor)\r
+ {\r
+ double w = static_cast<double>(params.background->width());\r
+ double h = static_cast<double>(params.background->height());\r
+ \r
+ ogl.enable(GL_SCISSOR_TEST);\r
+ ogl.scissor(static_cast<size_t>(m_p[0]*w), static_cast<size_t>(m_p[1]*h), static_cast<size_t>(m_s[0]*w), static_cast<size_t>(m_s[1]*h));\r
+ }\r
+\r
+ auto f_p = params.transform.fill_translation;\r
+ auto f_s = params.transform.fill_scale;\r
+ \r
+ // Set render target\r
+ \r
+ ogl.attach(*params.background);\r
\r
// Draw\r
\r
glBegin(GL_QUADS);\r
- glMultiTexCoord2d(GL_TEXTURE0, 0.0, 0.0); glMultiTexCoord2d(GL_TEXTURE1, f_p[0] , f_p[1] ); glVertex3d( f_p[0] *2.0-1.0, f_p[1] *2.0-1.0, z);\r
- glMultiTexCoord2d(GL_TEXTURE0, 1.0, 0.0); glMultiTexCoord2d(GL_TEXTURE1, (f_p[0]+f_s[0]), f_p[1] ); glVertex3d((f_p[0]+f_s[0])*2.0-1.0, f_p[1] *2.0-1.0, z);\r
- glMultiTexCoord2d(GL_TEXTURE0, 1.0, 1.0); glMultiTexCoord2d(GL_TEXTURE1, (f_p[0]+f_s[0]), (f_p[1]+f_s[1])); glVertex3d((f_p[0]+f_s[0])*2.0-1.0, (f_p[1]+f_s[1])*2.0-1.0, z);\r
- glMultiTexCoord2d(GL_TEXTURE0, 0.0, 1.0); glMultiTexCoord2d(GL_TEXTURE1, f_p[0] , (f_p[1]+f_s[1])); glVertex3d( f_p[0] *2.0-1.0, (f_p[1]+f_s[1])*2.0-1.0, z);\r
+ glMultiTexCoord2d(GL_TEXTURE0, 0.0, 0.0); glMultiTexCoord2d(GL_TEXTURE1, f_p[0] , f_p[1] ); glVertex2d( f_p[0] *2.0-1.0, f_p[1] *2.0-1.0);\r
+ glMultiTexCoord2d(GL_TEXTURE0, 1.0, 0.0); glMultiTexCoord2d(GL_TEXTURE1, (f_p[0]+f_s[0]), f_p[1] ); glVertex2d((f_p[0]+f_s[0])*2.0-1.0, f_p[1] *2.0-1.0);\r
+ glMultiTexCoord2d(GL_TEXTURE0, 1.0, 1.0); glMultiTexCoord2d(GL_TEXTURE1, (f_p[0]+f_s[0]), (f_p[1]+f_s[1])); glVertex2d((f_p[0]+f_s[0])*2.0-1.0, (f_p[1]+f_s[1])*2.0-1.0);\r
+ glMultiTexCoord2d(GL_TEXTURE0, 0.0, 1.0); glMultiTexCoord2d(GL_TEXTURE1, f_p[0] , (f_p[1]+f_s[1])); glVertex2d( f_p[0] *2.0-1.0, (f_p[1]+f_s[1])*2.0-1.0);\r
glEnd();\r
\r
- GL(glDisable(GL_SCISSOR_TEST)); \r
- GL(glDisable(GL_DEPTH_TEST)); \r
+ // Cleanup\r
+\r
+ ogl.disable(GL_SCISSOR_TEST); \r
+ \r
+ params.textures.clear();\r
+ ogl.yield(); // Return resources to pool as early as possible.\r
+\r
+ if(blend_modes_)\r
+ {\r
+ // http://www.opengl.org/registry/specs/NV/texture_barrier.txt\r
+ // This allows us to use framebuffer (background) both as source and target while blending.\r
+ glTextureBarrierNV(); \r
+ }\r
}\r
};\r
\r
image_kernel::image_kernel() : impl_(new implementation()){}\r
-\r
-void image_kernel::draw(size_t width, size_t height, const core::pixel_format_desc& pix_desc, const core::image_transform& transform, const std::vector<safe_ptr<device_buffer>>& planes, \r
- const safe_ptr<device_buffer>& background, const std::shared_ptr<device_buffer>& local_key, const std::shared_ptr<device_buffer>& layer_key)\r
+void image_kernel::draw(ogl_device& ogl, draw_params&& params)\r
{\r
- impl_->draw(width, height, pix_desc, transform, planes, background, local_key, layer_key);\r
+ impl_->draw(ogl, std::move(params));\r
}\r
\r
}}
\ No newline at end of file
projects / casparcg / blobdiff