diff --git a/src/ffmpeg-d3d11va/d3d11va_decoder.cc b/src/ffmpeg-d3d11va/d3d11va_decoder.cc index 02f352a..284387a 100644 --- a/src/ffmpeg-d3d11va/d3d11va_decoder.cc +++ b/src/ffmpeg-d3d11va/d3d11va_decoder.cc @@ -113,13 +113,14 @@ bool AVDecoder::Init(AVStream* stream, void* d3d11_device) d3d11_device_context->device->AddRef(); av_hwdevice_ctx_init(device_buffer_); - //codec_context_->hw_device_ctx = av_buffer_ref(device_buffer_); + codec_context_->hw_device_ctx = av_buffer_ref(device_buffer_); codec_context_->opaque = device_buffer_; } else { av_hwdevice_ctx_create(&device_buffer_, hw_type, NULL, NULL, 0); } + codec_context_->hw_device_ctx = av_buffer_ref(device_buffer_); codec_context_->get_format = get_d3d11va_hw_format; codec_context_->thread_count = 1; codec_context_->pkt_timebase = stream->time_base; diff --git a/src/ffmpeg-dxva2/dxva2_decoder.cc b/src/ffmpeg-dxva2/dxva2_decoder.cc index 2f9a1be..011042c 100644 --- a/src/ffmpeg-dxva2/dxva2_decoder.cc +++ b/src/ffmpeg-dxva2/dxva2_decoder.cc @@ -217,6 +217,7 @@ bool AVDecoder::Init(AVStream* stream, void* d3d9_device) av_hwdevice_ctx_create(&device_buffer_, hw_type, NULL, NULL, 0); } + codec_context_->hw_device_ctx = av_buffer_ref(device_buffer_); codec_context_->get_format = get_dxva2_hw_format; codec_context_->thread_count = 1; codec_context_->pkt_timebase = stream->time_base; diff --git a/src/video-renderer/d3d11_render_texture.cc b/src/video-renderer/d3d11_render_texture.cc index bc0a530..b54e4d9 100644 --- a/src/video-renderer/d3d11_render_texture.cc +++ b/src/video-renderer/d3d11_render_texture.cc @@ -370,16 +370,18 @@ void D3D11RenderTexture::Cleanup() DX_SAFE_RELEASE(vertex_layout_); DX_SAFE_RELEASE(vertex_constants_); DX_SAFE_RELEASE(vertex_shader_); + DX_SAFE_RELEASE(vertex_buffer_); + DX_SAFE_RELEASE(pixel_shader_); DX_SAFE_RELEASE(texture_); DX_SAFE_RELEASE(render_target_view_); DX_SAFE_RELEASE(texture_view_); + DX_SAFE_RELEASE(chrominance_view_); DX_SAFE_RELEASE(luminance_view_); DX_SAFE_RELEASE(d3d11_device_); DX_SAFE_RELEASE(d3d11_context_); - DX_SAFE_RELEASE(swap_chain_); } void D3D11RenderTexture::Begin() @@ -404,13 +406,7 @@ void D3D11RenderTexture::Begin() d3d11_context_->RSSetViewports(1, &viewport); D3D11_MAPPED_SUBRESOURCE mapped_resource; - HRESULT hr = d3d11_context_->Map( - (ID3D11Resource*)vertex_buffer_, - 0, - D3D11_MAP_WRITE_DISCARD, - 0, - &mapped_resource - ); + HRESULT hr = d3d11_context_->Map(vertex_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped_resource); if (FAILED(hr)) { LOG("ID3D11DeviceContext::Map() failed, %x \n", hr); return ; @@ -509,6 +505,4 @@ void D3D11RenderTexture::End() d3d11_context_->OMSetRenderTargets(1, &cache_render_target_view_, cache_depth_stencil_view_); DX_SAFE_RELEASE(cache_render_target_view_); DX_SAFE_RELEASE(cache_depth_stencil_view_); - - } diff --git a/src/video-renderer/d3d11_renderer.cc b/src/video-renderer/d3d11_renderer.cc index 23f0be4..e3aaf27 100644 --- a/src/video-renderer/d3d11_renderer.cc +++ b/src/video-renderer/d3d11_renderer.cc @@ -32,6 +32,8 @@ D3D11Renderer::~D3D11Renderer() bool D3D11Renderer::Init(HWND hwnd) { + std::lock_guard locker(mutex_); + wnd_ = hwnd; if (!InitDevice()) { @@ -50,6 +52,8 @@ bool D3D11Renderer::Init(HWND hwnd) void D3D11Renderer::Destroy() { + std::lock_guard locker(mutex_); + for (int i = 0; i < PIXEL_PLANE_MAX; i++) { input_texture_[i].reset(); } @@ -76,6 +80,8 @@ void D3D11Renderer::Destroy() bool D3D11Renderer::Resize() { + std::lock_guard locker(mutex_); + if (!swap_chain_) { return false; } @@ -85,6 +91,13 @@ bool D3D11Renderer::Resize() return false; } + UINT width = static_cast(rect.right - rect.left); + UINT height = static_cast(rect.bottom - rect.top); + + if (width == 0 && height == 0) { + return false; + } + d3d11_context_->OMSetRenderTargets(0, NULL, NULL); DX_SAFE_RELEASE(sharpen_constants_); @@ -105,8 +118,8 @@ bool D3D11Renderer::Resize() HRESULT hr = swap_chain_->ResizeBuffers( 0, - static_cast(rect.right - rect.left), - static_cast(rect.bottom - rect.top), + width, + height, DXGI_FORMAT_UNKNOWN, 0 ); @@ -127,6 +140,8 @@ bool D3D11Renderer::Resize() void D3D11Renderer::Render(PixelFrame* frame) { + std::lock_guard locker(mutex_); + if (!d3d11_device_) { return; } @@ -352,7 +367,7 @@ bool D3D11Renderer::CreateRenderer() return false; } - sampler_desc.Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;// D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR; + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;// D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR; hr = d3d11_device_->CreateSamplerState(&sampler_desc, &linear_sampler_); if (FAILED(hr)) { LOG("ID3D11Device::CreateSamplerState(LINEAR) failed, %x ", hr); diff --git a/src/video-renderer/d3d11_renderer.h b/src/video-renderer/d3d11_renderer.h index 3714d64..edc52fa 100644 --- a/src/video-renderer/d3d11_renderer.h +++ b/src/video-renderer/d3d11_renderer.h @@ -2,6 +2,7 @@ #include "renderer.h" #include "d3d11_render_texture.h" +#include namespace xop { @@ -37,9 +38,11 @@ class D3D11Renderer : public Renderer void UpdateI420(PixelFrame* frame); void UpdateNV12(PixelFrame* frame); + std::mutex mutex_; + HWND wnd_ = NULL; - D3D_DRIVER_TYPE driver_type_; - D3D_FEATURE_LEVEL feature_level_; + D3D_DRIVER_TYPE driver_type_ = D3D_DRIVER_TYPE_UNKNOWN; + D3D_FEATURE_LEVEL feature_level_ = D3D_FEATURE_LEVEL_11_0; ID3D11Device* d3d11_device_ = NULL; IDXGISwapChain* swap_chain_ = NULL; diff --git a/src/video-renderer/d3d9_render_texture.cc b/src/video-renderer/d3d9_render_texture.cc index 6adc006..1bcd3cd 100644 --- a/src/video-renderer/d3d9_render_texture.cc +++ b/src/video-renderer/d3d9_render_texture.cc @@ -205,6 +205,7 @@ void D3D9RenderTexture::Begin() d3dmatrix.m[3][0] = -1.0f; d3dmatrix.m[3][1] = 1.0f; d3dmatrix.m[3][3] = 1.0f; + //D3DXMatrixOrthoOffCenterLH(&projection, 0.0f, frame->width, frame->height, 0.0f, 0.0f, 1.0f); d3d9_device_->SetTransform(D3DTS_PROJECTION, &d3dmatrix); diff --git a/src/video-renderer/d3d9_renderer.cc b/src/video-renderer/d3d9_renderer.cc index 9f1a614..a24ba3e 100644 --- a/src/video-renderer/d3d9_renderer.cc +++ b/src/video-renderer/d3d9_renderer.cc @@ -65,6 +65,8 @@ void D3D9Renderer::Destroy() bool D3D9Renderer::Resize() { + std::lock_guard locker(mutex_); + if (!d3d9_device_) { return false; } @@ -74,6 +76,13 @@ bool D3D9Renderer::Resize() return false; } + UINT width = static_cast(client_rect.right - client_rect.left); + UINT height = static_cast(client_rect.bottom - client_rect.top); + + if (width == 0 && height == 0) { + return false; + } + for (int i = 0; i < PIXEL_PLANE_MAX; i++) { input_texture_[i].reset(); } @@ -86,8 +95,8 @@ bool D3D9Renderer::Resize() output_texture_ = NULL; pixel_format_ = PIXEL_FORMAT_UNKNOW; - present_params_.BackBufferWidth = static_cast(client_rect.right - client_rect.left); - present_params_.BackBufferHeight = static_cast(client_rect.bottom - client_rect.top); + present_params_.BackBufferWidth = width; + present_params_.BackBufferHeight = height; HRESULT hr = d3d9_device_->Reset(&present_params_); if (FAILED(hr)) { @@ -104,6 +113,8 @@ bool D3D9Renderer::Resize() void D3D9Renderer::Render(PixelFrame* frame) { + std::lock_guard locker(mutex_); + if (!d3d9_device_) { return; } @@ -122,6 +133,11 @@ void D3D9Renderer::Render(PixelFrame* frame) End(); } +IDirect3DDevice9* D3D9Renderer::GetDevice() +{ + return d3d9_device_; +} + void D3D9Renderer::SetSharpen(float unsharp) { unsharp_ = unsharp; @@ -403,7 +419,7 @@ void D3D9Renderer::End() return ; } - d3d9_device_->StretchRect(output_texture_->GetSurface(), NULL, back_buffer_, NULL, D3DTEXF_LINEAR); + d3d9_device_->StretchRect(output_texture_->GetSurface(), NULL, back_buffer_, NULL, D3DTEXF_NONE); DX_SAFE_RELEASE(back_buffer_); output_texture_ = NULL; } @@ -624,6 +640,6 @@ void D3D9Renderer::UpdateNV12(PixelFrame* frame) // NV12 To ARGB output_texture_ = input_texture_[PIXEL_PLANE_ARGB].get(); - d3d9_device_->StretchRect(surface, NULL, output_texture_->GetSurface(), NULL, D3DTEXF_NONE); + d3d9_device_->StretchRect(surface, NULL, output_texture_->GetSurface(), NULL, D3DTEXF_LINEAR); } } diff --git a/src/video-renderer/d3d9_renderer.h b/src/video-renderer/d3d9_renderer.h index 18e4e45..3703294 100644 --- a/src/video-renderer/d3d9_renderer.h +++ b/src/video-renderer/d3d9_renderer.h @@ -3,6 +3,8 @@ #include "renderer.h" #include "d3d9_render_texture.h" +#include + namespace xop { class D3D9Renderer : public Renderer @@ -18,6 +20,8 @@ class D3D9Renderer : public Renderer virtual void Render(PixelFrame* frame); + virtual IDirect3DDevice9* GetDevice(); + // sharpness: 0.0 to 10.0 virtual void SetSharpen(float unsharp); @@ -36,6 +40,8 @@ class D3D9Renderer : public Renderer void UpdateI420(PixelFrame* frame); void UpdateNV12(PixelFrame* frame); + std::mutex mutex_; + HWND hwnd_ = NULL; D3DCAPS9 d3d9_caps_; diff --git a/src/video-renderer/log.h b/src/video-renderer/log.h index a55f617..0103b1d 100644 --- a/src/video-renderer/log.h +++ b/src/video-renderer/log.h @@ -5,5 +5,5 @@ #define LOG(format, ...) \ { \ fprintf(stderr, "[%s:%d] " format " \n", \ - __FUNCTION__ , __LINE__, ##__VA_ARGS__); \ -} + __FUNCTION__ , __LINE__, ##__VA_ARGS__); \ +} \ No newline at end of file diff --git a/src/video-renderer/renderer.h b/src/video-renderer/renderer.h index 9de61c7..b8fa226 100644 --- a/src/video-renderer/renderer.h +++ b/src/video-renderer/renderer.h @@ -12,7 +12,7 @@ enum PixelFormat PIXEL_FORMAT_I420, PIXEL_FORMAT_NV12, PIXEL_FORMAT_I444, - PIXEL_FORMAT_MAX + PIXEL_FORMAT_MAX, }; enum PixelShader @@ -24,7 +24,7 @@ enum PixelShader PIXEL_SHADER_NV12_BT601, PIXEL_SHADER_NV12_BT709, PIXEL_SHADER_SHARPEN, - PIXEL_SHADER_MAX + PIXEL_SHADER_MAX, }; enum PixelPlane @@ -36,7 +36,7 @@ enum PixelPlane PIXEL_PLANE_U, PIXEL_PLANE_V, PIXEL_PLANE_UV, - PIXEL_PLANE_MAX + PIXEL_PLANE_MAX, }; struct PixelFrame diff --git a/src/video-renderer/shader/d3d11/shader_d3d11_nv12_bt601.h b/src/video-renderer/shader/d3d11/shader_d3d11_nv12_bt601.h index 07693c7..3208e57 100644 --- a/src/video-renderer/shader/d3d11/shader_d3d11_nv12_bt601.h +++ b/src/video-renderer/shader/d3d11/shader_d3d11_nv12_bt601.h @@ -42,7 +42,7 @@ dcl_temps 6 // v2.x <- input.color.x; v2.y <- input.color.y; v2.z <- input.color.z; v2.w <- input.color.w; // o0.x <-
.x; o0.y <-
.y; o0.z <-
.z; o0.w <-
.w // -#line 18 "G:\video-renderer\video-renderer\src\video-renderer\shader\d3d11\d3d11_nv12_bt601.hlsl" +#line 18 "G:\git1\video-renderer\src\video-renderer\shader\d3d11\d3d11_nv12_bt601.hlsl" mov r0.xyz, l(-0.062745,-0.501961,-0.501961,0) // r0.x <- offset.x; r0.y <- offset.y; r0.z <- offset.z #line 19 @@ -88,10 +88,10 @@ ret const BYTE shader_d3d11_nv12_bt601[] = { - 68, 88, 66, 67, 245, 71, - 206, 134, 254, 195, 9, 139, - 27, 156, 105, 151, 86, 14, - 20, 200, 1, 0, 0, 0, + 68, 88, 66, 67, 171, 5, + 210, 232, 83, 188, 234, 180, + 98, 1, 149, 11, 132, 148, + 47, 180, 1, 0, 0, 0, 88, 66, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, 8, 1, 0, 0, 124, 1, @@ -700,11 +700,11 @@ const BYTE shader_d3d11_nv12_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 148, 46, 49, 1, 224, 197, - 230, 96, 1, 0, 0, 0, - 58, 239, 201, 0, 210, 119, - 191, 64, 165, 223, 201, 252, - 67, 199, 13, 6, 0, 0, + 148, 46, 49, 1, 34, 7, + 244, 96, 1, 0, 0, 0, + 95, 71, 234, 234, 168, 110, + 91, 71, 186, 248, 199, 65, + 177, 249, 174, 79, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, @@ -785,101 +785,101 @@ const BYTE shader_d3d11_nv12_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 108, 111, 97, 116, - 50, 32, 116, 101, 120, 32, - 32, 32, 58, 32, 84, 69, - 88, 67, 79, 79, 82, 68, - 48, 59, 10, 32, 32, 32, - 32, 102, 108, 111, 97, 116, - 52, 32, 99, 111, 108, 111, - 114, 32, 58, 32, 67, 79, - 76, 79, 82, 48, 59, 10, - 125, 59, 10, 10, 102, 108, - 111, 97, 116, 52, 32, 109, - 97, 105, 110, 40, 80, 105, - 120, 101, 108, 83, 104, 97, - 100, 101, 114, 73, 110, 112, - 117, 116, 32, 105, 110, 112, - 117, 116, 41, 32, 58, 32, - 83, 86, 95, 84, 65, 82, - 71, 69, 84, 10, 123, 10, - 32, 32, 32, 32, 99, 111, - 110, 115, 116, 32, 102, 108, - 111, 97, 116, 51, 32, 111, - 102, 102, 115, 101, 116, 32, - 61, 32, 123, 45, 48, 46, - 48, 54, 50, 55, 52, 53, - 49, 48, 49, 55, 44, 32, + 0, 0, 82, 68, 48, 59, + 10, 32, 32, 32, 32, 102, + 108, 111, 97, 116, 52, 32, + 99, 111, 108, 111, 114, 32, + 58, 32, 67, 79, 76, 79, + 82, 48, 59, 10, 125, 59, + 10, 10, 102, 108, 111, 97, + 116, 52, 32, 109, 97, 105, + 110, 40, 80, 105, 120, 101, + 108, 83, 104, 97, 100, 101, + 114, 73, 110, 112, 117, 116, + 32, 105, 110, 112, 117, 116, + 41, 32, 58, 32, 83, 86, + 95, 84, 65, 82, 71, 69, + 84, 10, 123, 10, 32, 32, + 32, 32, 99, 111, 110, 115, + 116, 32, 102, 108, 111, 97, + 116, 51, 32, 111, 102, 102, + 115, 101, 116, 32, 61, 32, + 123, 45, 48, 46, 48, 54, + 50, 55, 52, 53, 49, 48, + 49, 55, 44, 32, 45, 48, + 46, 53, 48, 49, 57, 54, + 48, 56, 49, 52, 44, 32, 45, 48, 46, 53, 48, 49, 57, 54, 48, 56, 49, 52, - 44, 32, 45, 48, 46, 53, - 48, 49, 57, 54, 48, 56, - 49, 52, 125, 59, 10, 32, - 32, 32, 32, 99, 111, 110, - 115, 116, 32, 102, 108, 111, - 97, 116, 51, 32, 82, 99, - 111, 101, 102, 102, 32, 61, - 32, 123, 49, 46, 49, 54, - 52, 52, 44, 32, 32, 48, - 46, 48, 48, 48, 48, 44, - 32, 32, 49, 46, 55, 57, - 50, 55, 125, 59, 10, 32, - 32, 32, 32, 99, 111, 110, - 115, 116, 32, 102, 108, 111, - 97, 116, 51, 32, 71, 99, - 111, 101, 102, 102, 32, 61, - 32, 123, 49, 46, 49, 54, - 52, 52, 44, 32, 45, 48, - 46, 50, 49, 51, 50, 44, - 32, 45, 48, 46, 53, 51, - 50, 57, 125, 59, 10, 32, - 32, 32, 32, 99, 111, 110, - 115, 116, 32, 102, 108, 111, - 97, 116, 51, 32, 66, 99, - 111, 101, 102, 102, 32, 61, - 32, 123, 49, 46, 49, 54, - 52, 52, 44, 32, 32, 50, - 46, 49, 49, 50, 52, 44, - 32, 32, 48, 46, 48, 48, - 48, 48, 125, 59, 10, 10, + 125, 59, 10, 32, 32, 32, + 32, 99, 111, 110, 115, 116, + 32, 102, 108, 111, 97, 116, + 51, 32, 82, 99, 111, 101, + 102, 102, 32, 61, 32, 123, + 49, 46, 49, 54, 52, 52, + 44, 32, 32, 48, 46, 48, + 48, 48, 48, 44, 32, 32, + 49, 46, 55, 57, 50, 55, + 125, 59, 10, 32, 32, 32, + 32, 99, 111, 110, 115, 116, + 32, 102, 108, 111, 97, 116, + 51, 32, 71, 99, 111, 101, + 102, 102, 32, 61, 32, 123, + 49, 46, 49, 54, 52, 52, + 44, 32, 45, 48, 46, 50, + 49, 51, 50, 44, 32, 45, + 48, 46, 53, 51, 50, 57, + 125, 59, 10, 32, 32, 32, + 32, 99, 111, 110, 115, 116, + 32, 102, 108, 111, 97, 116, + 51, 32, 66, 99, 111, 101, + 102, 102, 32, 61, 32, 123, + 49, 46, 49, 54, 52, 52, + 44, 32, 32, 50, 46, 49, + 49, 50, 52, 44, 32, 32, + 48, 46, 48, 48, 48, 48, + 125, 59, 10, 10, 32, 32, + 32, 32, 102, 108, 111, 97, + 116, 52, 32, 79, 117, 116, + 112, 117, 116, 59, 10, 10, 32, 32, 32, 32, 102, 108, - 111, 97, 116, 52, 32, 79, - 117, 116, 112, 117, 116, 59, + 111, 97, 116, 51, 32, 121, + 117, 118, 59, 10, 32, 32, + 32, 32, 121, 117, 118, 46, + 120, 32, 61, 32, 89, 84, + 101, 120, 116, 117, 114, 101, + 46, 83, 97, 109, 112, 108, + 101, 40, 76, 105, 110, 101, + 97, 114, 83, 97, 109, 112, + 108, 101, 114, 44, 32, 105, + 110, 112, 117, 116, 46, 116, + 101, 120, 41, 46, 114, 59, + 10, 32, 32, 32, 32, 121, + 117, 118, 46, 121, 122, 32, + 61, 32, 85, 86, 84, 101, + 120, 116, 117, 114, 101, 46, + 83, 97, 109, 112, 108, 101, + 40, 76, 105, 110, 101, 97, + 114, 83, 97, 109, 112, 108, + 101, 114, 44, 32, 105, 110, + 112, 117, 116, 46, 116, 101, + 120, 41, 46, 114, 103, 59, 10, 10, 32, 32, 32, 32, - 102, 108, 111, 97, 116, 51, - 32, 121, 117, 118, 59, 10, - 32, 32, 32, 32, 121, 117, - 118, 46, 120, 32, 61, 32, - 89, 84, 101, 120, 116, 117, - 114, 101, 46, 83, 97, 109, - 112, 108, 101, 40, 76, 105, - 110, 101, 97, 114, 83, 97, - 109, 112, 108, 101, 114, 44, - 32, 105, 110, 112, 117, 116, - 46, 116, 101, 120, 41, 46, - 114, 59, 10, 32, 32, 32, - 32, 121, 117, 118, 46, 121, - 122, 32, 61, 32, 85, 86, - 84, 101, 120, 116, 117, 114, - 101, 46, 83, 97, 109, 112, - 108, 101, 40, 76, 105, 110, - 101, 97, 114, 83, 97, 109, - 112, 108, 101, 114, 44, 32, - 105, 110, 112, 117, 116, 46, - 116, 101, 120, 41, 46, 114, - 103, 59, 10, 10, 32, 32, - 32, 32, 121, 117, 118, 32, - 43, 61, 32, 111, 102, 102, - 115, 101, 116, 59, 198, 90, + 121, 117, 118, 32, 43, 61, + 32, 111, 102, 102, 115, 101, + 116, 59, 10, 32, 32, 32, + 32, 79, 117, 116, 112, 117, + 116, 46, 114, 32, 61, 32, + 100, 111, 116, 40, 198, 90, 0, 0, 117, 131, 1, 0, 24, 184, 3, 0, 47, 63, 0, 0, 38, 247, 2, 0, 65, 36, 1, 0, 39, 82, 3, 0, 76, 232, 3, 0, - 217, 42, 2, 0, 151, 219, - 1, 0, 206, 55, 0, 0, - 57, 206, 1, 0, 221, 119, - 0, 0, 90, 28, 0, 0, + 217, 42, 2, 0, 249, 221, + 3, 0, 206, 55, 0, 0, + 57, 206, 1, 0, 135, 116, + 2, 0, 90, 28, 0, 0, 177, 197, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1128,93 +1128,93 @@ const BYTE shader_d3d11_nv12_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 239, 254, 239, 1, 0, 0, 0, - 131, 4, 0, 0, 0, 71, - 58, 92, 118, 105, 100, 101, + 111, 4, 0, 0, 0, 71, + 58, 92, 103, 105, 116, 49, + 92, 118, 105, 100, 101, 111, + 45, 114, 101, 110, 100, 101, + 114, 101, 114, 92, 115, 114, + 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 114, 99, 92, - 118, 105, 100, 101, 111, 45, - 114, 101, 110, 100, 101, 114, - 101, 114, 92, 115, 104, 97, - 100, 101, 114, 92, 100, 51, - 100, 49, 49, 92, 100, 51, - 100, 49, 49, 95, 110, 118, - 49, 50, 95, 98, 116, 54, - 48, 49, 46, 104, 108, 115, - 108, 0, 0, 103, 58, 92, - 118, 105, 100, 101, 111, 45, - 114, 101, 110, 100, 101, 114, - 101, 114, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 114, 99, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 104, 97, 100, 101, - 114, 92, 100, 51, 100, 49, - 49, 92, 100, 51, 100, 49, - 49, 95, 110, 118, 49, 50, - 95, 98, 116, 54, 48, 49, - 46, 104, 108, 115, 108, 0, - 47, 47, 32, 83, 68, 76, - 32, 115, 104, 97, 100, 101, - 114, 44, 32, 104, 116, 116, - 112, 115, 58, 47, 47, 103, - 105, 116, 104, 117, 98, 46, - 99, 111, 109, 47, 108, 105, - 98, 115, 100, 108, 45, 111, - 114, 103, 47, 83, 68, 76, - 47, 98, 108, 111, 98, 47, - 109, 97, 105, 110, 47, 115, - 114, 99, 47, 114, 101, 110, - 100, 101, 114, 47, 100, 105, - 114, 101, 99, 116, 51, 100, - 49, 49, 47, 83, 68, 76, - 95, 115, 104, 97, 100, 101, - 114, 115, 95, 100, 51, 100, - 49, 49, 46, 99, 10, 10, - 84, 101, 120, 116, 117, 114, - 101, 50, 68, 32, 89, 84, - 101, 120, 116, 117, 114, 101, - 32, 58, 32, 114, 101, 103, - 105, 115, 116, 101, 114, 40, - 116, 48, 41, 59, 10, 84, - 101, 120, 116, 117, 114, 101, - 50, 68, 32, 85, 86, 84, - 101, 120, 116, 117, 114, 101, + 101, 114, 101, 114, 92, 115, + 104, 97, 100, 101, 114, 92, + 100, 51, 100, 49, 49, 92, + 100, 51, 100, 49, 49, 95, + 110, 118, 49, 50, 95, 98, + 116, 54, 48, 49, 46, 104, + 108, 115, 108, 0, 0, 103, + 58, 92, 103, 105, 116, 49, + 92, 118, 105, 100, 101, 111, + 45, 114, 101, 110, 100, 101, + 114, 101, 114, 92, 115, 114, + 99, 92, 118, 105, 100, 101, + 111, 45, 114, 101, 110, 100, + 101, 114, 101, 114, 92, 115, + 104, 97, 100, 101, 114, 92, + 100, 51, 100, 49, 49, 92, + 100, 51, 100, 49, 49, 95, + 110, 118, 49, 50, 95, 98, + 116, 54, 48, 49, 46, 104, + 108, 115, 108, 0, 47, 47, + 32, 83, 68, 76, 32, 115, + 104, 97, 100, 101, 114, 44, + 32, 104, 116, 116, 112, 115, + 58, 47, 47, 103, 105, 116, + 104, 117, 98, 46, 99, 111, + 109, 47, 108, 105, 98, 115, + 100, 108, 45, 111, 114, 103, + 47, 83, 68, 76, 47, 98, + 108, 111, 98, 47, 109, 97, + 105, 110, 47, 115, 114, 99, + 47, 114, 101, 110, 100, 101, + 114, 47, 100, 105, 114, 101, + 99, 116, 51, 100, 49, 49, + 47, 83, 68, 76, 95, 115, + 104, 97, 100, 101, 114, 115, + 95, 100, 51, 100, 49, 49, + 46, 99, 10, 10, 84, 101, + 120, 116, 117, 114, 101, 50, + 68, 32, 89, 84, 101, 120, + 116, 117, 114, 101, 32, 58, + 32, 114, 101, 103, 105, 115, + 116, 101, 114, 40, 116, 48, + 41, 59, 10, 84, 101, 120, + 116, 117, 114, 101, 50, 68, + 32, 85, 86, 84, 101, 120, + 116, 117, 114, 101, 32, 58, + 32, 114, 101, 103, 105, 115, + 116, 101, 114, 40, 116, 49, + 41, 59, 10, 10, 83, 97, + 109, 112, 108, 101, 114, 83, + 116, 97, 116, 101, 32, 76, + 105, 110, 101, 97, 114, 83, + 97, 109, 112, 108, 101, 114, 32, 58, 32, 114, 101, 103, 105, 115, 116, 101, 114, 40, - 116, 49, 41, 59, 10, 10, - 83, 97, 109, 112, 108, 101, - 114, 83, 116, 97, 116, 101, - 32, 76, 105, 110, 101, 97, - 114, 83, 97, 109, 112, 108, - 101, 114, 32, 58, 32, 114, - 101, 103, 105, 115, 116, 101, - 114, 40, 115, 48, 41, 59, - 10, 83, 97, 109, 112, 108, - 101, 114, 83, 116, 97, 116, - 101, 32, 80, 111, 105, 110, - 116, 83, 97, 109, 112, 108, - 101, 114, 32, 32, 58, 32, - 114, 101, 103, 105, 115, 116, - 101, 114, 40, 115, 49, 41, - 59, 10, 10, 115, 116, 114, - 117, 99, 116, 32, 80, 105, - 120, 101, 108, 83, 104, 97, - 100, 101, 114, 73, 110, 112, - 117, 116, 10, 123, 10, 32, + 115, 48, 41, 59, 10, 83, + 97, 109, 112, 108, 101, 114, + 83, 116, 97, 116, 101, 32, + 80, 111, 105, 110, 116, 83, + 97, 109, 112, 108, 101, 114, + 32, 32, 58, 32, 114, 101, + 103, 105, 115, 116, 101, 114, + 40, 115, 49, 41, 59, 10, + 10, 115, 116, 114, 117, 99, + 116, 32, 80, 105, 120, 101, + 108, 83, 104, 97, 100, 101, + 114, 73, 110, 112, 117, 116, + 10, 123, 10, 32, 32, 32, + 32, 102, 108, 111, 97, 116, + 52, 32, 112, 111, 115, 32, + 32, 32, 58, 32, 83, 86, + 95, 80, 79, 83, 73, 84, + 73, 79, 78, 59, 10, 32, 32, 32, 32, 102, 108, 111, - 97, 116, 52, 32, 112, 111, - 115, 32, 32, 32, 58, 32, - 83, 86, 95, 80, 79, 83, - 73, 84, 73, 79, 78, 59, - 10, 32, 32, 32, 32, 102, + 97, 116, 50, 32, 116, 101, + 120, 32, 32, 32, 58, 32, + 84, 69, 88, 67, 79, 79, 27, 226, 48, 1, 128, 0, - 0, 0, 77, 2, 192, 253, - 219, 115, 215, 1, 1, 0, + 0, 0, 99, 248, 32, 136, + 194, 123, 215, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1226,11 +1226,11 @@ const BYTE shader_d3d11_nv12_bt601[] = 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 89, 0, 0, 0, 40, 0, + 79, 0, 0, 0, 40, 0, 0, 0, 27, 226, 48, 1, 147, 244, 39, 23, 210, 3, 0, 0, 1, 0, 0, 0, - 88, 0, 0, 0, 89, 0, + 78, 0, 0, 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1685,14 +1685,14 @@ const BYTE shader_d3d11_nv12_bt601[] = 10, 0, 24, 21, 7, 16, 0, 0, 1, 0, 1, 0, 14, 0, 23, 21, 0, 16, - 0, 0, 3, 2, 240, 2, + 0, 0, 3, 2, 224, 2, 0, 0, 242, 241, 10, 0, 24, 21, 9, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, 10, 16, 0, 0, 1, 0, 0, 2, 14, 0, 23, 21, 0, 0, 0, 0, - 10, 2, 240, 2, 0, 0, + 10, 2, 224, 2, 0, 0, 242, 241, 10, 0, 24, 21, 12, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, @@ -1809,36 +1809,36 @@ const BYTE shader_d3d11_nv12_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 10, 32, 32, 32, - 32, 79, 117, 116, 112, 117, - 116, 46, 114, 32, 61, 32, - 100, 111, 116, 40, 121, 117, - 118, 44, 32, 82, 99, 111, - 101, 102, 102, 41, 59, 10, - 32, 32, 32, 32, 79, 117, - 116, 112, 117, 116, 46, 103, - 32, 61, 32, 100, 111, 116, - 40, 121, 117, 118, 44, 32, - 71, 99, 111, 101, 102, 102, - 41, 59, 10, 32, 32, 32, + 0, 0, 121, 117, 118, 44, + 32, 82, 99, 111, 101, 102, + 102, 41, 59, 10, 32, 32, + 32, 32, 79, 117, 116, 112, + 117, 116, 46, 103, 32, 61, + 32, 100, 111, 116, 40, 121, + 117, 118, 44, 32, 71, 99, + 111, 101, 102, 102, 41, 59, + 10, 32, 32, 32, 32, 79, + 117, 116, 112, 117, 116, 46, + 98, 32, 61, 32, 100, 111, + 116, 40, 121, 117, 118, 44, + 32, 66, 99, 111, 101, 102, + 102, 41, 59, 10, 32, 32, + 32, 32, 79, 117, 116, 112, + 117, 116, 46, 97, 32, 61, + 32, 49, 46, 48, 102, 59, + 10, 10, 32, 32, 32, 32, + 114, 101, 116, 117, 114, 110, 32, 79, 117, 116, 112, 117, - 116, 46, 98, 32, 61, 32, - 100, 111, 116, 40, 121, 117, - 118, 44, 32, 66, 99, 111, - 101, 102, 102, 41, 59, 10, - 32, 32, 32, 32, 79, 117, - 116, 112, 117, 116, 46, 97, - 32, 61, 32, 49, 46, 48, - 102, 59, 10, 10, 32, 32, - 32, 32, 114, 101, 116, 117, - 114, 110, 32, 79, 117, 116, - 112, 117, 116, 59, 10, 125, - 0, 7, 0, 0, 0, 0, - 0, 0, 0, 88, 0, 0, - 0, 1, 0, 0, 0, 89, - 0, 0, 0, 176, 0, 0, + 116, 59, 10, 125, 0, 7, + 0, 0, 0, 0, 0, 0, + 0, 78, 0, 0, 0, 79, + 0, 0, 0, 156, 0, 0, + 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2327,7 +2327,7 @@ const BYTE shader_d3d11_nv12_bt601[] = 14, 0, 63, 92, 15, 0, 0, 0, 76, 0, 0, 0, 32, 0, 0, 0, 44, 0, - 0, 0, 100, 0, 0, 0, + 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 25, 0, 0, 0, 0, 0, @@ -2335,20 +2335,20 @@ const BYTE shader_d3d11_nv12_bt601[] = 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 28, 2, 0, 0, 32, 0, - 0, 96, 0, 0, 13, 6, + 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 9, 0, 152, 5, 0, 0, 0, 0, 0, 0, 252, 1, 0, 0, - 1, 0, 0, 0, 192, 154, - 29, 3, 0, 0, 0, 0, + 1, 0, 0, 0, 56, 186, + 33, 3, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 105, 110, 0, 110, 111, 110, 101, 0, 0, 0, 45, 186, 46, 241, 1, 0, 0, 0, 0, 0, 0, 0, 28, 2, 0, 0, 32, 0, 0, 96, - 0, 0, 13, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 7, 0, 0, 0, 0, 0, 1, 0, @@ -2359,29 +2359,29 @@ const BYTE shader_d3d11_nv12_bt601[] = 0, 0, 0, 0, 255, 255, 255, 255, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 71, 58, 92, 118, + 0, 0, 71, 58, 92, 103, + 105, 116, 49, 92, 118, 105, + 100, 101, 111, 45, 114, 101, + 110, 100, 101, 114, 101, 114, + 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, 101, - 114, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 114, 99, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 104, 97, 100, 101, 114, - 92, 100, 51, 100, 49, 49, - 92, 100, 51, 100, 49, 49, - 95, 110, 118, 49, 50, 95, - 98, 116, 54, 48, 49, 46, - 104, 108, 115, 108, 0, 0, - 254, 239, 254, 239, 1, 0, - 0, 0, 1, 0, 0, 0, - 0, 1, 0, 0, 0, 0, + 114, 92, 115, 104, 97, 100, + 101, 114, 92, 100, 51, 100, + 49, 49, 92, 100, 51, 100, + 49, 49, 95, 110, 118, 49, + 50, 95, 98, 116, 54, 48, + 49, 46, 104, 108, 115, 108, + 0, 0, 0, 0, 254, 239, + 254, 239, 1, 0, 0, 0, + 1, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 255, + 255, 255, 255, 255, 255, 255, + 255, 255, 255, 12, 0, 255, + 255, 255, 255, 255, 255, 255, + 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 12, - 0, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2407,11 +2407,11 @@ const BYTE shader_d3d11_nv12_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 46, - 49, 1, 224, 197, 230, 96, - 1, 0, 0, 0, 58, 239, - 201, 0, 210, 119, 191, 64, - 165, 223, 201, 252, 67, 199, - 13, 6, 132, 0, 0, 0, + 49, 1, 34, 7, 244, 96, + 1, 0, 0, 0, 95, 71, + 234, 234, 168, 110, 91, 71, + 186, 248, 199, 65, 177, 249, + 174, 79, 122, 0, 0, 0, 47, 76, 105, 110, 107, 73, 110, 102, 111, 0, 47, 110, 97, 109, 101, 115, 0, 47, @@ -2420,30 +2420,30 @@ const BYTE shader_d3d11_nv12_bt601[] = 111, 99, 107, 0, 47, 115, 114, 99, 47, 102, 105, 108, 101, 115, 47, 103, 58, 92, + 103, 105, 116, 49, 92, 118, + 105, 100, 101, 111, 45, 114, + 101, 110, 100, 101, 114, 101, + 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, - 101, 114, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 114, 99, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 104, 97, 100, 101, - 114, 92, 100, 51, 100, 49, - 49, 92, 100, 51, 100, 49, - 49, 95, 110, 118, 49, 50, - 95, 98, 116, 54, 48, 49, - 46, 104, 108, 115, 108, 0, - 4, 0, 0, 0, 6, 0, - 0, 0, 1, 0, 0, 0, - 30, 0, 0, 0, 0, 0, - 0, 0, 17, 0, 0, 0, - 7, 0, 0, 0, 34, 0, + 101, 114, 92, 115, 104, 97, + 100, 101, 114, 92, 100, 51, + 100, 49, 49, 92, 100, 51, + 100, 49, 49, 95, 110, 118, + 49, 50, 95, 98, 116, 54, + 48, 49, 46, 104, 108, 115, + 108, 0, 4, 0, 0, 0, + 6, 0, 0, 0, 1, 0, + 0, 0, 27, 0, 0, 0, + 0, 0, 0, 0, 34, 0, 0, 0, 8, 0, 0, 0, - 10, 0, 0, 0, 6, 0, + 17, 0, 0, 0, 7, 0, + 0, 0, 10, 0, 0, 0, + 6, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 0, 0, 0, 0, 220, 81, + 51, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5, 0, 0, 0, 0, 0, - 0, 0, 220, 81, 51, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2493,10 +2493,10 @@ const BYTE shader_d3d11_nv12_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 32, 0, - 0, 0, 224, 0, 0, 0, - 96, 1, 0, 0, 107, 1, + 0, 0, 214, 0, 0, 0, + 96, 1, 0, 0, 99, 1, 0, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 179, 4, + 0, 0, 0, 0, 159, 4, 0, 0, 128, 0, 0, 0, 210, 3, 0, 0, 168, 7, 0, 0, 68, 0, 0, 0, diff --git a/src/video-renderer/shader/d3d11/shader_d3d11_nv12_bt709.h b/src/video-renderer/shader/d3d11/shader_d3d11_nv12_bt709.h index c33a4bb..ecde5d7 100644 --- a/src/video-renderer/shader/d3d11/shader_d3d11_nv12_bt709.h +++ b/src/video-renderer/shader/d3d11/shader_d3d11_nv12_bt709.h @@ -42,7 +42,7 @@ dcl_temps 6 // v2.x <- input.color.x; v2.y <- input.color.y; v2.z <- input.color.z; v2.w <- input.color.w; // o0.x <-
.x; o0.y <-
.y; o0.z <-
.z; o0.w <-
.w // -#line 18 "G:\video-renderer\video-renderer\src\video-renderer\shader\d3d11\d3d11_nv12_bt709.hlsl" +#line 18 "G:\git1\video-renderer\src\video-renderer\shader\d3d11\d3d11_nv12_bt709.hlsl" mov r0.xyz, l(-0.062745,-0.501961,-0.501961,0) // r0.x <- offset.x; r0.y <- offset.y; r0.z <- offset.z #line 19 @@ -88,10 +88,10 @@ ret const BYTE shader_d3d11_nv12_bt709[] = { - 68, 88, 66, 67, 35, 135, - 232, 255, 4, 250, 13, 117, - 116, 26, 120, 188, 9, 18, - 97, 101, 1, 0, 0, 0, + 68, 88, 66, 67, 245, 222, + 192, 76, 34, 249, 222, 130, + 153, 144, 143, 129, 234, 104, + 196, 88, 1, 0, 0, 0, 88, 66, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, 8, 1, 0, 0, 124, 1, @@ -700,11 +700,11 @@ const BYTE shader_d3d11_nv12_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 148, 46, 49, 1, 224, 197, - 230, 96, 1, 0, 0, 0, - 103, 238, 68, 102, 150, 31, - 140, 67, 162, 161, 147, 151, - 6, 245, 56, 116, 0, 0, + 148, 46, 49, 1, 35, 7, + 244, 96, 1, 0, 0, 0, + 149, 128, 36, 254, 242, 147, + 222, 64, 130, 27, 234, 250, + 170, 59, 202, 242, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, @@ -785,100 +785,100 @@ const BYTE shader_d3d11_nv12_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 108, 111, 97, 116, - 50, 32, 116, 101, 120, 32, - 32, 32, 58, 32, 84, 69, - 88, 67, 79, 79, 82, 68, - 48, 59, 10, 32, 32, 32, - 32, 102, 108, 111, 97, 116, - 52, 32, 99, 111, 108, 111, - 114, 32, 58, 32, 67, 79, - 76, 79, 82, 48, 59, 10, - 125, 59, 10, 10, 102, 108, - 111, 97, 116, 52, 32, 109, - 97, 105, 110, 40, 80, 105, - 120, 101, 108, 83, 104, 97, - 100, 101, 114, 73, 110, 112, - 117, 116, 32, 105, 110, 112, - 117, 116, 41, 32, 58, 32, - 83, 86, 95, 84, 65, 82, - 71, 69, 84, 10, 123, 10, - 32, 32, 32, 32, 99, 111, - 110, 115, 116, 32, 102, 108, - 111, 97, 116, 51, 32, 111, - 102, 102, 115, 101, 116, 32, - 61, 32, 123, 45, 48, 46, - 48, 54, 50, 55, 52, 53, - 49, 48, 49, 55, 44, 32, + 0, 0, 82, 68, 48, 59, + 10, 32, 32, 32, 32, 102, + 108, 111, 97, 116, 52, 32, + 99, 111, 108, 111, 114, 32, + 58, 32, 67, 79, 76, 79, + 82, 48, 59, 10, 125, 59, + 10, 10, 102, 108, 111, 97, + 116, 52, 32, 109, 97, 105, + 110, 40, 80, 105, 120, 101, + 108, 83, 104, 97, 100, 101, + 114, 73, 110, 112, 117, 116, + 32, 105, 110, 112, 117, 116, + 41, 32, 58, 32, 83, 86, + 95, 84, 65, 82, 71, 69, + 84, 10, 123, 10, 32, 32, + 32, 32, 99, 111, 110, 115, + 116, 32, 102, 108, 111, 97, + 116, 51, 32, 111, 102, 102, + 115, 101, 116, 32, 61, 32, + 123, 45, 48, 46, 48, 54, + 50, 55, 52, 53, 49, 48, + 49, 55, 44, 32, 45, 48, + 46, 53, 48, 49, 57, 54, + 48, 56, 49, 52, 44, 32, 45, 48, 46, 53, 48, 49, 57, 54, 48, 56, 49, 52, - 44, 32, 45, 48, 46, 53, - 48, 49, 57, 54, 48, 56, - 49, 52, 125, 59, 10, 32, - 32, 32, 32, 99, 111, 110, - 115, 116, 32, 102, 108, 111, - 97, 116, 51, 32, 82, 99, - 111, 101, 102, 102, 32, 61, - 32, 123, 49, 46, 49, 54, - 52, 52, 44, 32, 32, 48, - 46, 48, 48, 48, 48, 44, - 32, 32, 49, 46, 53, 57, - 54, 48, 125, 59, 10, 32, - 32, 32, 32, 99, 111, 110, - 115, 116, 32, 102, 108, 111, - 97, 116, 51, 32, 71, 99, - 111, 101, 102, 102, 32, 61, - 32, 123, 49, 46, 49, 54, - 52, 52, 44, 32, 45, 48, - 46, 51, 57, 49, 56, 44, - 32, 45, 48, 46, 56, 49, - 51, 48, 125, 59, 10, 32, - 32, 32, 32, 99, 111, 110, - 115, 116, 32, 102, 108, 111, - 97, 116, 51, 32, 66, 99, - 111, 101, 102, 102, 32, 61, - 32, 123, 49, 46, 49, 54, - 52, 52, 44, 32, 32, 50, - 46, 48, 49, 55, 50, 44, - 32, 32, 48, 46, 48, 48, - 48, 48, 125, 59, 10, 10, + 125, 59, 10, 32, 32, 32, + 32, 99, 111, 110, 115, 116, + 32, 102, 108, 111, 97, 116, + 51, 32, 82, 99, 111, 101, + 102, 102, 32, 61, 32, 123, + 49, 46, 49, 54, 52, 52, + 44, 32, 32, 48, 46, 48, + 48, 48, 48, 44, 32, 32, + 49, 46, 53, 57, 54, 48, + 125, 59, 10, 32, 32, 32, + 32, 99, 111, 110, 115, 116, + 32, 102, 108, 111, 97, 116, + 51, 32, 71, 99, 111, 101, + 102, 102, 32, 61, 32, 123, + 49, 46, 49, 54, 52, 52, + 44, 32, 45, 48, 46, 51, + 57, 49, 56, 44, 32, 45, + 48, 46, 56, 49, 51, 48, + 125, 59, 10, 32, 32, 32, + 32, 99, 111, 110, 115, 116, + 32, 102, 108, 111, 97, 116, + 51, 32, 66, 99, 111, 101, + 102, 102, 32, 61, 32, 123, + 49, 46, 49, 54, 52, 52, + 44, 32, 32, 50, 46, 48, + 49, 55, 50, 44, 32, 32, + 48, 46, 48, 48, 48, 48, + 125, 59, 10, 10, 32, 32, + 32, 32, 102, 108, 111, 97, + 116, 52, 32, 79, 117, 116, + 112, 117, 116, 59, 10, 10, 32, 32, 32, 32, 102, 108, - 111, 97, 116, 52, 32, 79, - 117, 116, 112, 117, 116, 59, + 111, 97, 116, 51, 32, 121, + 117, 118, 59, 10, 32, 32, + 32, 32, 121, 117, 118, 46, + 120, 32, 61, 32, 89, 84, + 101, 120, 116, 117, 114, 101, + 46, 83, 97, 109, 112, 108, + 101, 40, 76, 105, 110, 101, + 97, 114, 83, 97, 109, 112, + 108, 101, 114, 44, 32, 105, + 110, 112, 117, 116, 46, 116, + 101, 120, 41, 46, 114, 59, + 10, 32, 32, 32, 32, 121, + 117, 118, 46, 121, 122, 32, + 61, 32, 85, 86, 84, 101, + 120, 116, 117, 114, 101, 46, + 83, 97, 109, 112, 108, 101, + 40, 76, 105, 110, 101, 97, + 114, 83, 97, 109, 112, 108, + 101, 114, 44, 32, 105, 110, + 112, 117, 116, 46, 116, 101, + 120, 41, 46, 114, 103, 59, 10, 10, 32, 32, 32, 32, - 102, 108, 111, 97, 116, 51, - 32, 121, 117, 118, 59, 10, - 32, 32, 32, 32, 121, 117, - 118, 46, 120, 32, 61, 32, - 89, 84, 101, 120, 116, 117, - 114, 101, 46, 83, 97, 109, - 112, 108, 101, 40, 76, 105, - 110, 101, 97, 114, 83, 97, - 109, 112, 108, 101, 114, 44, - 32, 105, 110, 112, 117, 116, - 46, 116, 101, 120, 41, 46, - 114, 59, 10, 32, 32, 32, - 32, 121, 117, 118, 46, 121, - 122, 32, 61, 32, 85, 86, - 84, 101, 120, 116, 117, 114, - 101, 46, 83, 97, 109, 112, - 108, 101, 40, 76, 105, 110, - 101, 97, 114, 83, 97, 109, - 112, 108, 101, 114, 44, 32, - 105, 110, 112, 117, 116, 46, - 116, 101, 120, 41, 46, 114, - 103, 59, 10, 10, 32, 32, - 32, 32, 121, 117, 118, 32, - 43, 61, 32, 111, 102, 102, - 115, 101, 116, 59, 198, 90, + 121, 117, 118, 32, 43, 61, + 32, 111, 102, 102, 115, 101, + 116, 59, 10, 32, 32, 32, + 32, 79, 117, 116, 112, 117, + 116, 46, 114, 32, 61, 32, + 100, 111, 116, 40, 198, 90, 0, 0, 117, 131, 1, 0, 24, 184, 3, 0, 47, 63, 0, 0, 38, 247, 2, 0, 65, 36, 1, 0, 39, 82, 3, 0, 76, 232, 3, 0, - 217, 42, 2, 0, 177, 210, + 217, 42, 2, 0, 142, 195, 1, 0, 206, 55, 0, 0, - 57, 206, 1, 0, 187, 121, + 57, 206, 1, 0, 4, 75, 0, 0, 90, 28, 0, 0, 177, 197, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, @@ -1128,93 +1128,93 @@ const BYTE shader_d3d11_nv12_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 239, 254, 239, 1, 0, 0, 0, - 131, 4, 0, 0, 0, 71, - 58, 92, 118, 105, 100, 101, + 111, 4, 0, 0, 0, 71, + 58, 92, 103, 105, 116, 49, + 92, 118, 105, 100, 101, 111, + 45, 114, 101, 110, 100, 101, + 114, 101, 114, 92, 115, 114, + 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 114, 99, 92, - 118, 105, 100, 101, 111, 45, - 114, 101, 110, 100, 101, 114, - 101, 114, 92, 115, 104, 97, - 100, 101, 114, 92, 100, 51, - 100, 49, 49, 92, 100, 51, - 100, 49, 49, 95, 110, 118, - 49, 50, 95, 98, 116, 55, - 48, 57, 46, 104, 108, 115, - 108, 0, 0, 103, 58, 92, - 118, 105, 100, 101, 111, 45, - 114, 101, 110, 100, 101, 114, - 101, 114, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 114, 99, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 104, 97, 100, 101, - 114, 92, 100, 51, 100, 49, - 49, 92, 100, 51, 100, 49, - 49, 95, 110, 118, 49, 50, - 95, 98, 116, 55, 48, 57, - 46, 104, 108, 115, 108, 0, - 47, 47, 32, 83, 68, 76, - 32, 115, 104, 97, 100, 101, - 114, 44, 32, 104, 116, 116, - 112, 115, 58, 47, 47, 103, - 105, 116, 104, 117, 98, 46, - 99, 111, 109, 47, 108, 105, - 98, 115, 100, 108, 45, 111, - 114, 103, 47, 83, 68, 76, - 47, 98, 108, 111, 98, 47, - 109, 97, 105, 110, 47, 115, - 114, 99, 47, 114, 101, 110, - 100, 101, 114, 47, 100, 105, - 114, 101, 99, 116, 51, 100, - 49, 49, 47, 83, 68, 76, - 95, 115, 104, 97, 100, 101, - 114, 115, 95, 100, 51, 100, - 49, 49, 46, 99, 10, 10, - 84, 101, 120, 116, 117, 114, - 101, 50, 68, 32, 89, 84, - 101, 120, 116, 117, 114, 101, - 32, 58, 32, 114, 101, 103, - 105, 115, 116, 101, 114, 40, - 116, 48, 41, 59, 10, 84, - 101, 120, 116, 117, 114, 101, - 50, 68, 32, 85, 86, 84, - 101, 120, 116, 117, 114, 101, + 101, 114, 101, 114, 92, 115, + 104, 97, 100, 101, 114, 92, + 100, 51, 100, 49, 49, 92, + 100, 51, 100, 49, 49, 95, + 110, 118, 49, 50, 95, 98, + 116, 55, 48, 57, 46, 104, + 108, 115, 108, 0, 0, 103, + 58, 92, 103, 105, 116, 49, + 92, 118, 105, 100, 101, 111, + 45, 114, 101, 110, 100, 101, + 114, 101, 114, 92, 115, 114, + 99, 92, 118, 105, 100, 101, + 111, 45, 114, 101, 110, 100, + 101, 114, 101, 114, 92, 115, + 104, 97, 100, 101, 114, 92, + 100, 51, 100, 49, 49, 92, + 100, 51, 100, 49, 49, 95, + 110, 118, 49, 50, 95, 98, + 116, 55, 48, 57, 46, 104, + 108, 115, 108, 0, 47, 47, + 32, 83, 68, 76, 32, 115, + 104, 97, 100, 101, 114, 44, + 32, 104, 116, 116, 112, 115, + 58, 47, 47, 103, 105, 116, + 104, 117, 98, 46, 99, 111, + 109, 47, 108, 105, 98, 115, + 100, 108, 45, 111, 114, 103, + 47, 83, 68, 76, 47, 98, + 108, 111, 98, 47, 109, 97, + 105, 110, 47, 115, 114, 99, + 47, 114, 101, 110, 100, 101, + 114, 47, 100, 105, 114, 101, + 99, 116, 51, 100, 49, 49, + 47, 83, 68, 76, 95, 115, + 104, 97, 100, 101, 114, 115, + 95, 100, 51, 100, 49, 49, + 46, 99, 10, 10, 84, 101, + 120, 116, 117, 114, 101, 50, + 68, 32, 89, 84, 101, 120, + 116, 117, 114, 101, 32, 58, + 32, 114, 101, 103, 105, 115, + 116, 101, 114, 40, 116, 48, + 41, 59, 10, 84, 101, 120, + 116, 117, 114, 101, 50, 68, + 32, 85, 86, 84, 101, 120, + 116, 117, 114, 101, 32, 58, + 32, 114, 101, 103, 105, 115, + 116, 101, 114, 40, 116, 49, + 41, 59, 10, 10, 83, 97, + 109, 112, 108, 101, 114, 83, + 116, 97, 116, 101, 32, 76, + 105, 110, 101, 97, 114, 83, + 97, 109, 112, 108, 101, 114, 32, 58, 32, 114, 101, 103, 105, 115, 116, 101, 114, 40, - 116, 49, 41, 59, 10, 10, - 83, 97, 109, 112, 108, 101, - 114, 83, 116, 97, 116, 101, - 32, 76, 105, 110, 101, 97, - 114, 83, 97, 109, 112, 108, - 101, 114, 32, 58, 32, 114, - 101, 103, 105, 115, 116, 101, - 114, 40, 115, 48, 41, 59, - 10, 83, 97, 109, 112, 108, - 101, 114, 83, 116, 97, 116, - 101, 32, 80, 111, 105, 110, - 116, 83, 97, 109, 112, 108, - 101, 114, 32, 32, 58, 32, - 114, 101, 103, 105, 115, 116, - 101, 114, 40, 115, 49, 41, - 59, 10, 10, 115, 116, 114, - 117, 99, 116, 32, 80, 105, - 120, 101, 108, 83, 104, 97, - 100, 101, 114, 73, 110, 112, - 117, 116, 10, 123, 10, 32, + 115, 48, 41, 59, 10, 83, + 97, 109, 112, 108, 101, 114, + 83, 116, 97, 116, 101, 32, + 80, 111, 105, 110, 116, 83, + 97, 109, 112, 108, 101, 114, + 32, 32, 58, 32, 114, 101, + 103, 105, 115, 116, 101, 114, + 40, 115, 49, 41, 59, 10, + 10, 115, 116, 114, 117, 99, + 116, 32, 80, 105, 120, 101, + 108, 83, 104, 97, 100, 101, + 114, 73, 110, 112, 117, 116, + 10, 123, 10, 32, 32, 32, + 32, 102, 108, 111, 97, 116, + 52, 32, 112, 111, 115, 32, + 32, 32, 58, 32, 83, 86, + 95, 80, 79, 83, 73, 84, + 73, 79, 78, 59, 10, 32, 32, 32, 32, 102, 108, 111, - 97, 116, 52, 32, 112, 111, - 115, 32, 32, 32, 58, 32, - 83, 86, 95, 80, 79, 83, - 73, 84, 73, 79, 78, 59, - 10, 32, 32, 32, 32, 102, + 97, 116, 50, 32, 116, 101, + 120, 32, 32, 32, 58, 32, + 84, 69, 88, 67, 79, 79, 27, 226, 48, 1, 128, 0, - 0, 0, 37, 236, 250, 253, - 219, 115, 215, 1, 1, 0, + 0, 0, 8, 31, 99, 136, + 194, 123, 215, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1226,11 +1226,11 @@ const BYTE shader_d3d11_nv12_bt709[] = 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 89, 0, 0, 0, 40, 0, + 79, 0, 0, 0, 40, 0, 0, 0, 27, 226, 48, 1, 131, 99, 216, 38, 210, 3, 0, 0, 1, 0, 0, 0, - 88, 0, 0, 0, 89, 0, + 78, 0, 0, 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1685,14 +1685,14 @@ const BYTE shader_d3d11_nv12_bt709[] = 10, 0, 24, 21, 7, 16, 0, 0, 1, 0, 1, 0, 14, 0, 23, 21, 0, 16, - 0, 0, 3, 2, 176, 2, + 0, 0, 3, 2, 16, 3, 0, 0, 242, 241, 10, 0, 24, 21, 9, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, 10, 16, 0, 0, 1, 0, 0, 2, 14, 0, 23, 21, 0, 0, 0, 0, - 10, 2, 176, 2, 0, 0, + 10, 2, 16, 3, 0, 0, 242, 241, 10, 0, 24, 21, 12, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, @@ -1809,36 +1809,36 @@ const BYTE shader_d3d11_nv12_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 10, 32, 32, 32, - 32, 79, 117, 116, 112, 117, - 116, 46, 114, 32, 61, 32, - 100, 111, 116, 40, 121, 117, - 118, 44, 32, 82, 99, 111, - 101, 102, 102, 41, 59, 10, - 32, 32, 32, 32, 79, 117, - 116, 112, 117, 116, 46, 103, - 32, 61, 32, 100, 111, 116, - 40, 121, 117, 118, 44, 32, - 71, 99, 111, 101, 102, 102, - 41, 59, 10, 32, 32, 32, + 0, 0, 121, 117, 118, 44, + 32, 82, 99, 111, 101, 102, + 102, 41, 59, 10, 32, 32, + 32, 32, 79, 117, 116, 112, + 117, 116, 46, 103, 32, 61, + 32, 100, 111, 116, 40, 121, + 117, 118, 44, 32, 71, 99, + 111, 101, 102, 102, 41, 59, + 10, 32, 32, 32, 32, 79, + 117, 116, 112, 117, 116, 46, + 98, 32, 61, 32, 100, 111, + 116, 40, 121, 117, 118, 44, + 32, 66, 99, 111, 101, 102, + 102, 41, 59, 10, 32, 32, + 32, 32, 79, 117, 116, 112, + 117, 116, 46, 97, 32, 61, + 32, 49, 46, 48, 102, 59, + 10, 10, 32, 32, 32, 32, + 114, 101, 116, 117, 114, 110, 32, 79, 117, 116, 112, 117, - 116, 46, 98, 32, 61, 32, - 100, 111, 116, 40, 121, 117, - 118, 44, 32, 66, 99, 111, - 101, 102, 102, 41, 59, 10, - 32, 32, 32, 32, 79, 117, - 116, 112, 117, 116, 46, 97, - 32, 61, 32, 49, 46, 48, - 102, 59, 10, 10, 32, 32, - 32, 32, 114, 101, 116, 117, - 114, 110, 32, 79, 117, 116, - 112, 117, 116, 59, 10, 125, - 0, 7, 0, 0, 0, 89, - 0, 0, 0, 88, 0, 0, - 0, 0, 0, 0, 0, 176, + 116, 59, 10, 125, 0, 7, + 0, 0, 0, 79, 0, 0, + 0, 78, 0, 0, 0, 0, + 0, 0, 0, 156, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, + 0, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, - 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2239,8 +2239,8 @@ const BYTE shader_d3d11_nv12_bt709[] = 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, + 116, 0, 0, 0, 0, 0, + 105, 0, 111, 0, 255, 255, 255, 255, 26, 9, 47, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2327,7 +2327,7 @@ const BYTE shader_d3d11_nv12_bt709[] = 14, 0, 63, 92, 15, 0, 0, 0, 76, 0, 0, 0, 32, 0, 0, 0, 44, 0, - 0, 0, 100, 0, 0, 0, + 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 25, 0, 0, 0, 0, 0, @@ -2335,20 +2335,20 @@ const BYTE shader_d3d11_nv12_bt709[] = 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 28, 2, 0, 0, 32, 0, - 0, 96, 0, 0, 56, 116, + 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 9, 0, 152, 5, 0, 0, 0, 0, 0, 0, 252, 1, 0, 0, - 1, 0, 0, 0, 224, 154, - 241, 2, 0, 0, 0, 0, + 1, 0, 0, 0, 184, 186, + 37, 3, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 105, 110, 0, 110, 111, 110, 101, 0, 0, 0, 45, 186, 46, 241, 1, 0, 0, 0, 0, 0, 0, 0, 28, 2, 0, 0, 32, 0, 0, 96, - 0, 0, 56, 116, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 7, 0, 0, 0, 0, 0, 1, 0, @@ -2359,29 +2359,29 @@ const BYTE shader_d3d11_nv12_bt709[] = 0, 0, 0, 0, 255, 255, 255, 255, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 71, 58, 92, 118, + 0, 0, 71, 58, 92, 103, + 105, 116, 49, 92, 118, 105, + 100, 101, 111, 45, 114, 101, + 110, 100, 101, 114, 101, 114, + 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, 101, - 114, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 114, 99, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 104, 97, 100, 101, 114, - 92, 100, 51, 100, 49, 49, - 92, 100, 51, 100, 49, 49, - 95, 110, 118, 49, 50, 95, - 98, 116, 55, 48, 57, 46, - 104, 108, 115, 108, 0, 0, - 254, 239, 254, 239, 1, 0, - 0, 0, 1, 0, 0, 0, - 0, 1, 0, 0, 0, 0, + 114, 92, 115, 104, 97, 100, + 101, 114, 92, 100, 51, 100, + 49, 49, 92, 100, 51, 100, + 49, 49, 95, 110, 118, 49, + 50, 95, 98, 116, 55, 48, + 57, 46, 104, 108, 115, 108, + 0, 0, 0, 0, 254, 239, + 254, 239, 1, 0, 0, 0, + 1, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 255, + 255, 255, 255, 255, 255, 255, + 255, 255, 255, 12, 0, 255, + 255, 255, 255, 255, 255, 255, + 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 12, - 0, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2407,11 +2407,11 @@ const BYTE shader_d3d11_nv12_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 46, - 49, 1, 224, 197, 230, 96, - 1, 0, 0, 0, 103, 238, - 68, 102, 150, 31, 140, 67, - 162, 161, 147, 151, 6, 245, - 56, 116, 132, 0, 0, 0, + 49, 1, 35, 7, 244, 96, + 1, 0, 0, 0, 149, 128, + 36, 254, 242, 147, 222, 64, + 130, 27, 234, 250, 170, 59, + 202, 242, 122, 0, 0, 0, 47, 76, 105, 110, 107, 73, 110, 102, 111, 0, 47, 110, 97, 109, 101, 115, 0, 47, @@ -2420,30 +2420,30 @@ const BYTE shader_d3d11_nv12_bt709[] = 111, 99, 107, 0, 47, 115, 114, 99, 47, 102, 105, 108, 101, 115, 47, 103, 58, 92, + 103, 105, 116, 49, 92, 118, + 105, 100, 101, 111, 45, 114, + 101, 110, 100, 101, 114, 101, + 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, - 101, 114, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 114, 99, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 104, 97, 100, 101, - 114, 92, 100, 51, 100, 49, - 49, 92, 100, 51, 100, 49, - 49, 95, 110, 118, 49, 50, - 95, 98, 116, 55, 48, 57, - 46, 104, 108, 115, 108, 0, - 4, 0, 0, 0, 6, 0, - 0, 0, 1, 0, 0, 0, - 58, 0, 0, 0, 0, 0, - 0, 0, 17, 0, 0, 0, - 7, 0, 0, 0, 10, 0, - 0, 0, 6, 0, 0, 0, - 0, 0, 0, 0, 5, 0, - 0, 0, 34, 0, 0, 0, - 8, 0, 0, 0, 0, 0, - 0, 0, 220, 81, 51, 1, + 101, 114, 92, 115, 104, 97, + 100, 101, 114, 92, 100, 51, + 100, 49, 49, 92, 100, 51, + 100, 49, 49, 95, 110, 118, + 49, 50, 95, 98, 116, 55, + 48, 57, 46, 104, 108, 115, + 108, 0, 4, 0, 0, 0, + 6, 0, 0, 0, 1, 0, + 0, 0, 58, 0, 0, 0, + 0, 0, 0, 0, 17, 0, + 0, 0, 7, 0, 0, 0, + 10, 0, 0, 0, 6, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 34, 0, + 0, 0, 8, 0, 0, 0, + 0, 0, 0, 0, 220, 81, + 51, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2493,10 +2493,10 @@ const BYTE shader_d3d11_nv12_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 32, 0, - 0, 0, 224, 0, 0, 0, - 96, 1, 0, 0, 107, 1, + 0, 0, 214, 0, 0, 0, + 96, 1, 0, 0, 99, 1, 0, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 179, 4, + 0, 0, 0, 0, 159, 4, 0, 0, 128, 0, 0, 0, 210, 3, 0, 0, 168, 7, 0, 0, 68, 0, 0, 0, diff --git a/src/video-renderer/shader/d3d11/shader_d3d11_pixel.h b/src/video-renderer/shader/d3d11/shader_d3d11_pixel.h index 51e5bf6..87a326e 100644 --- a/src/video-renderer/shader/d3d11/shader_d3d11_pixel.h +++ b/src/video-renderer/shader/d3d11/shader_d3d11_pixel.h @@ -39,7 +39,7 @@ dcl_output o0.xyzw // v2.x <- input.color.x; v2.y <- input.color.y; v2.z <- input.color.z; v2.w <- input.color.w; // o0.x <-
.x; o0.y <-
.y; o0.z <-
.z; o0.w <-
.w // -#line 15 "G:\video-renderer\video-renderer\src\video-renderer\shader\d3d11\d3d11_pixel.hlsl" +#line 15 "G:\git1\video-renderer\src\video-renderer\shader\d3d11\d3d11_pixel.hlsl" sample o0.xyzw, v1.xyxx, t0.xyzw, s0 ret // Approximately 2 instruction slots used @@ -47,10 +47,10 @@ ret const BYTE shader_d3d11_pixel[] = { - 68, 88, 66, 67, 33, 176, - 24, 152, 209, 151, 226, 101, - 76, 109, 167, 82, 136, 226, - 81, 106, 1, 0, 0, 0, + 68, 88, 66, 67, 98, 128, + 30, 232, 16, 124, 177, 49, + 33, 143, 38, 243, 208, 241, + 125, 7, 1, 0, 0, 0, 116, 56, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, 220, 0, 0, 0, 80, 1, @@ -579,10 +579,10 @@ const BYTE shader_d3d11_pixel[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 46, 49, 1, - 225, 197, 230, 96, 1, 0, - 0, 0, 15, 4, 218, 135, - 118, 188, 114, 67, 180, 158, - 89, 113, 11, 173, 214, 111, + 35, 7, 244, 96, 1, 0, + 0, 0, 184, 30, 37, 104, + 88, 182, 100, 66, 191, 165, + 243, 24, 168, 246, 50, 249, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, @@ -663,40 +663,40 @@ const BYTE shader_d3d11_pixel[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 118, 41, - 59, 10, 125, 0, 7, 0, - 0, 0, 0, 0, 0, 0, - 83, 0, 0, 0, 0, 0, - 0, 0, 84, 0, 0, 0, - 166, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 114, 101, - 114, 92, 115, 114, 99, 92, - 118, 105, 100, 101, 111, 45, - 114, 101, 110, 100, 101, 114, - 101, 114, 92, 115, 104, 97, - 100, 101, 114, 92, 100, 51, - 100, 49, 49, 92, 100, 51, - 100, 49, 49, 95, 112, 105, - 120, 101, 108, 46, 104, 108, - 115, 108, 0, 0, 103, 58, - 92, 118, 105, 100, 101, 111, + 1, 0, 0, 0, 74, 0, + 0, 0, 146, 0, 0, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, - 114, 101, 114, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 114, 99, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 104, 97, 100, - 101, 114, 92, 100, 51, 100, - 49, 49, 92, 100, 51, 100, - 49, 49, 95, 112, 105, 120, - 101, 108, 46, 104, 108, 115, - 108, 0, 4, 0, 0, 0, - 83, 0, 0, 0, 84, 0, + 114, 101, 114, 92, 115, 114, + 99, 92, 118, 105, 100, 101, + 111, 45, 114, 101, 110, 100, + 101, 114, 101, 114, 92, 115, + 104, 97, 100, 101, 114, 92, + 100, 51, 100, 49, 49, 92, + 100, 51, 100, 49, 49, 95, + 112, 105, 120, 101, 108, 46, + 104, 108, 115, 108, 0, 0, + 103, 58, 92, 103, 105, 116, + 49, 92, 118, 105, 100, 101, + 111, 45, 114, 101, 110, 100, + 101, 114, 101, 114, 92, 115, + 114, 99, 92, 118, 105, 100, + 101, 111, 45, 114, 101, 110, + 100, 101, 114, 101, 114, 92, + 115, 104, 97, 100, 101, 114, + 92, 100, 51, 100, 49, 49, + 92, 100, 51, 100, 49, 49, + 95, 112, 105, 120, 101, 108, + 46, 104, 108, 115, 108, 0, + 4, 0, 0, 0, 73, 0, + 0, 0, 1, 0, 0, 0, + 74, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -753,9 +753,9 @@ const BYTE shader_d3d11_pixel[] = 1, 0, 142, 60, 1, 0, 47, 63, 0, 0, 38, 247, 2, 0, 65, 36, 1, 0, - 39, 82, 3, 0, 240, 37, - 2, 0, 217, 42, 2, 0, - 21, 230, 0, 0, 122, 76, + 39, 82, 3, 0, 142, 195, + 1, 0, 217, 42, 2, 0, + 21, 230, 0, 0, 4, 75, 0, 0, 73, 20, 1, 0, 153, 189, 3, 0, 0, 16, 0, 0, 0, 0, 0, 0, @@ -921,93 +921,93 @@ const BYTE shader_d3d11_pixel[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 239, 254, 239, 1, 0, 0, 0, - 250, 1, 0, 0, 0, 71, - 58, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 114, 99, 92, - 118, 105, 100, 101, 111, 45, - 114, 101, 110, 100, 101, 114, - 101, 114, 92, 115, 104, 97, - 100, 101, 114, 92, 100, 51, - 100, 49, 49, 92, 100, 51, - 100, 49, 49, 95, 112, 105, - 120, 101, 108, 46, 104, 108, - 115, 108, 0, 0, 103, 58, + 230, 1, 0, 0, 0, 71, + 58, 92, 103, 105, 116, 49, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, - 114, 101, 114, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 114, 99, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 104, 97, 100, - 101, 114, 92, 100, 51, 100, - 49, 49, 92, 100, 51, 100, - 49, 49, 95, 112, 105, 120, - 101, 108, 46, 104, 108, 115, - 108, 0, 84, 101, 120, 116, - 117, 114, 101, 50, 68, 32, + 114, 101, 114, 92, 115, 114, + 99, 92, 118, 105, 100, 101, + 111, 45, 114, 101, 110, 100, + 101, 114, 101, 114, 92, 115, + 104, 97, 100, 101, 114, 92, + 100, 51, 100, 49, 49, 92, + 100, 51, 100, 49, 49, 95, + 112, 105, 120, 101, 108, 46, + 104, 108, 115, 108, 0, 0, + 103, 58, 92, 103, 105, 116, + 49, 92, 118, 105, 100, 101, + 111, 45, 114, 101, 110, 100, + 101, 114, 101, 114, 92, 115, + 114, 99, 92, 118, 105, 100, + 101, 111, 45, 114, 101, 110, + 100, 101, 114, 101, 114, 92, + 115, 104, 97, 100, 101, 114, + 92, 100, 51, 100, 49, 49, + 92, 100, 51, 100, 49, 49, + 95, 112, 105, 120, 101, 108, + 46, 104, 108, 115, 108, 0, 84, 101, 120, 116, 117, 114, - 101, 32, 58, 32, 114, 101, + 101, 50, 68, 32, 84, 101, + 120, 116, 117, 114, 101, 32, + 58, 32, 114, 101, 103, 105, + 115, 116, 101, 114, 40, 116, + 48, 41, 59, 10, 10, 83, + 97, 109, 112, 108, 101, 114, + 83, 116, 97, 116, 101, 32, + 76, 105, 110, 101, 97, 114, + 83, 97, 109, 112, 108, 101, + 114, 32, 58, 32, 114, 101, 103, 105, 115, 116, 101, 114, - 40, 116, 48, 41, 59, 10, - 10, 83, 97, 109, 112, 108, - 101, 114, 83, 116, 97, 116, - 101, 32, 76, 105, 110, 101, - 97, 114, 83, 97, 109, 112, - 108, 101, 114, 32, 58, 32, - 114, 101, 103, 105, 115, 116, - 101, 114, 40, 115, 48, 41, - 59, 10, 83, 97, 109, 112, - 108, 101, 114, 83, 116, 97, - 116, 101, 32, 80, 111, 105, - 110, 116, 83, 97, 109, 112, - 108, 101, 114, 32, 32, 58, - 32, 114, 101, 103, 105, 115, - 116, 101, 114, 40, 115, 49, - 41, 59, 10, 10, 115, 116, - 114, 117, 99, 116, 32, 80, - 105, 120, 101, 108, 83, 104, - 97, 100, 101, 114, 73, 110, - 112, 117, 116, 10, 123, 10, - 32, 32, 32, 32, 102, 108, - 111, 97, 116, 52, 32, 112, - 111, 115, 32, 58, 32, 83, - 86, 95, 80, 79, 83, 73, - 84, 73, 79, 78, 59, 10, - 32, 32, 32, 32, 102, 108, - 111, 97, 116, 50, 32, 117, - 118, 32, 58, 32, 84, 69, - 88, 67, 79, 79, 82, 68, - 48, 59, 10, 32, 32, 32, - 32, 102, 108, 111, 97, 116, - 52, 32, 99, 111, 108, 111, - 114, 32, 58, 32, 67, 79, - 76, 79, 82, 48, 59, 10, - 125, 59, 10, 10, 102, 108, - 111, 97, 116, 52, 32, 109, - 97, 105, 110, 40, 80, 105, - 120, 101, 108, 83, 104, 97, - 100, 101, 114, 73, 110, 112, - 117, 116, 32, 105, 110, 112, - 117, 116, 41, 32, 58, 32, - 83, 86, 95, 84, 65, 82, - 71, 69, 84, 10, 123, 10, - 32, 32, 32, 32, 114, 101, - 116, 117, 114, 110, 32, 84, - 101, 120, 116, 117, 114, 101, - 46, 83, 97, 109, 112, 108, - 101, 40, 76, 105, 110, 101, - 97, 114, 83, 97, 109, 112, - 108, 101, 114, 44, 32, 105, - 110, 112, 117, 116, 46, 117, + 40, 115, 48, 41, 59, 10, + 83, 97, 109, 112, 108, 101, + 114, 83, 116, 97, 116, 101, + 32, 80, 111, 105, 110, 116, + 83, 97, 109, 112, 108, 101, + 114, 32, 32, 58, 32, 114, + 101, 103, 105, 115, 116, 101, + 114, 40, 115, 49, 41, 59, + 10, 10, 115, 116, 114, 117, + 99, 116, 32, 80, 105, 120, + 101, 108, 83, 104, 97, 100, + 101, 114, 73, 110, 112, 117, + 116, 10, 123, 10, 32, 32, + 32, 32, 102, 108, 111, 97, + 116, 52, 32, 112, 111, 115, + 32, 58, 32, 83, 86, 95, + 80, 79, 83, 73, 84, 73, + 79, 78, 59, 10, 32, 32, + 32, 32, 102, 108, 111, 97, + 116, 50, 32, 117, 118, 32, + 58, 32, 84, 69, 88, 67, + 79, 79, 82, 68, 48, 59, + 10, 32, 32, 32, 32, 102, + 108, 111, 97, 116, 52, 32, + 99, 111, 108, 111, 114, 32, + 58, 32, 67, 79, 76, 79, + 82, 48, 59, 10, 125, 59, + 10, 10, 102, 108, 111, 97, + 116, 52, 32, 109, 97, 105, + 110, 40, 80, 105, 120, 101, + 108, 83, 104, 97, 100, 101, + 114, 73, 110, 112, 117, 116, + 32, 105, 110, 112, 117, 116, + 41, 32, 58, 32, 83, 86, + 95, 84, 65, 82, 71, 69, + 84, 10, 123, 10, 32, 32, + 32, 32, 114, 101, 116, 117, + 114, 110, 32, 84, 101, 120, + 116, 117, 114, 101, 46, 83, + 97, 109, 112, 108, 101, 40, + 76, 105, 110, 101, 97, 114, + 83, 97, 109, 112, 108, 101, + 114, 44, 32, 105, 110, 112, + 117, 116, 46, 117, 118, 41, + 59, 10, 125, 0, 7, 0, + 0, 0, 0, 0, 0, 0, + 73, 0, 0, 0, 0, 0, 27, 226, 48, 1, 128, 0, - 0, 0, 100, 171, 64, 254, - 219, 115, 215, 1, 1, 0, + 0, 0, 226, 164, 158, 136, + 194, 123, 215, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1019,11 +1019,11 @@ const BYTE shader_d3d11_pixel[] = 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 84, 0, 0, 0, 40, 0, + 74, 0, 0, 0, 40, 0, 0, 0, 27, 226, 48, 1, 185, 210, 46, 203, 83, 1, 0, 0, 1, 0, 0, 0, - 83, 0, 0, 0, 84, 0, + 73, 0, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1302,13 +1302,13 @@ const BYTE shader_d3d11_pixel[] = 23, 0, 1, 0, 4, 16, 0, 0, 14, 0, 23, 21, 0, 16, 0, 0, 3, 2, - 80, 0, 0, 0, 242, 241, + 16, 3, 0, 0, 242, 241, 10, 0, 24, 21, 7, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, 8, 16, 0, 0, 1, 0, 0, 2, 14, 0, 23, 21, 0, 0, - 0, 0, 10, 2, 80, 0, + 0, 0, 10, 2, 16, 3, 0, 0, 242, 241, 10, 0, 24, 21, 10, 16, 0, 0, 1, 0, 1, 0, 10, 0, @@ -1864,7 +1864,7 @@ const BYTE shader_d3d11_pixel[] = 14, 0, 63, 92, 15, 0, 0, 0, 76, 0, 0, 0, 32, 0, 0, 0, 44, 0, - 0, 0, 96, 0, 0, 0, + 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 25, 0, 0, 0, 0, 0, @@ -1877,8 +1877,8 @@ const BYTE shader_d3d11_pixel[] = 0, 0, 2, 0, 9, 0, 108, 2, 0, 0, 0, 0, 0, 0, 124, 0, 0, 0, - 1, 0, 0, 0, 168, 130, - 109, 2, 0, 0, 0, 0, + 1, 0, 0, 0, 24, 153, + 78, 3, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 105, 110, 0, 110, 111, 110, 101, 0, 0, 0, 45, 186, @@ -1896,21 +1896,19 @@ const BYTE shader_d3d11_pixel[] = 0, 0, 0, 0, 255, 255, 255, 255, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 71, 58, 92, 118, + 0, 0, 71, 58, 92, 103, + 105, 116, 49, 92, 118, 105, + 100, 101, 111, 45, 114, 101, + 110, 100, 101, 114, 101, 114, + 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, 101, - 114, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 114, 99, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 104, 97, 100, 101, 114, - 92, 100, 51, 100, 49, 49, - 92, 100, 51, 100, 49, 49, - 95, 112, 105, 120, 101, 108, - 46, 104, 108, 115, 108, 0, - 0, 0, 254, 239, 254, 239, + 114, 92, 115, 104, 97, 100, + 101, 114, 92, 100, 51, 100, + 49, 49, 92, 100, 51, 100, + 49, 49, 95, 112, 105, 120, + 101, 108, 46, 104, 108, 115, + 108, 0, 254, 239, 254, 239, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1943,12 +1941,14 @@ const BYTE shader_d3d11_pixel[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 46, - 49, 1, 225, 197, 230, 96, - 1, 0, 0, 0, 15, 4, - 218, 135, 118, 188, 114, 67, - 180, 158, 89, 113, 11, 173, - 214, 111, 127, 0, 0, 0, + 49, 1, 35, 7, 244, 96, + 1, 0, 0, 0, 184, 30, + 37, 104, 88, 182, 100, 66, + 191, 165, 243, 24, 168, 246, + 50, 249, 117, 0, 0, 0, 47, 76, 105, 110, 107, 73, 110, 102, 111, 0, 47, 110, 97, 109, 101, 115, 0, 47, @@ -1957,30 +1957,30 @@ const BYTE shader_d3d11_pixel[] = 111, 99, 107, 0, 47, 115, 114, 99, 47, 102, 105, 108, 101, 115, 47, 103, 58, 92, + 103, 105, 116, 49, 92, 118, + 105, 100, 101, 111, 45, 114, + 101, 110, 100, 101, 114, 101, + 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, - 101, 114, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 114, 99, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 104, 97, 100, 101, - 114, 92, 100, 51, 100, 49, - 49, 92, 100, 51, 100, 49, - 49, 95, 112, 105, 120, 101, - 108, 46, 104, 108, 115, 108, - 0, 4, 0, 0, 0, 6, - 0, 0, 0, 1, 0, 0, - 0, 58, 0, 0, 0, 0, - 0, 0, 0, 17, 0, 0, - 0, 7, 0, 0, 0, 10, - 0, 0, 0, 6, 0, 0, - 0, 0, 0, 0, 0, 5, - 0, 0, 0, 34, 0, 0, - 0, 8, 0, 0, 0, 0, - 0, 0, 0, 220, 81, 51, - 1, 0, 0, 0, 0, 0, + 101, 114, 92, 115, 104, 97, + 100, 101, 114, 92, 100, 51, + 100, 49, 49, 92, 100, 51, + 100, 49, 49, 95, 112, 105, + 120, 101, 108, 46, 104, 108, + 115, 108, 0, 4, 0, 0, + 0, 6, 0, 0, 0, 1, + 0, 0, 0, 27, 0, 0, + 0, 0, 0, 0, 0, 34, + 0, 0, 0, 8, 0, 0, + 0, 17, 0, 0, 0, 7, + 0, 0, 0, 10, 0, 0, + 0, 6, 0, 0, 0, 0, + 0, 0, 0, 5, 0, 0, + 0, 0, 0, 0, 0, 220, + 81, 51, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2030,10 +2030,10 @@ const BYTE shader_d3d11_pixel[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 32, 0, - 0, 0, 219, 0, 0, 0, - 60, 1, 0, 0, 103, 1, + 0, 0, 209, 0, 0, 0, + 60, 1, 0, 0, 91, 1, 0, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 42, 2, + 0, 0, 0, 0, 22, 2, 0, 0, 128, 0, 0, 0, 83, 1, 0, 0, 248, 2, 0, 0, 60, 0, 0, 0, diff --git a/src/video-renderer/shader/d3d11/shader_d3d11_sharpen.h b/src/video-renderer/shader/d3d11/shader_d3d11_sharpen.h index 5a5c563..e8803c0 100644 --- a/src/video-renderer/shader/d3d11/shader_d3d11_sharpen.h +++ b/src/video-renderer/shader/d3d11/shader_d3d11_sharpen.h @@ -54,7 +54,7 @@ dcl_temps 5 // v2.x <- input.color.x; v2.y <- input.color.y; v2.z <- input.color.z; v2.w <- input.color.w; // o0.x <-
.x; o0.y <-
.y; o0.z <-
.z; o0.w <-
.w // -#line 25 "G:\video-renderer\video-renderer\src\video-renderer\shader\d3d11\d3d11_sharpen.hlsl" +#line 25 "G:\git1\video-renderer\src\video-renderer\shader\d3d11\d3d11_sharpen.hlsl" div r0.x, l(1.000000), cb0[0].x // r0.x <- ps.x div r0.y, l(1.000000), cb0[0].y // r0.y <- ps.y @@ -125,10 +125,10 @@ ret const BYTE shader_d3d11_sharpen[] = { - 68, 88, 66, 67, 23, 226, - 158, 56, 66, 229, 231, 49, - 78, 72, 69, 136, 153, 135, - 235, 227, 1, 0, 0, 0, + 68, 88, 66, 67, 89, 79, + 127, 229, 82, 61, 32, 248, + 138, 174, 197, 158, 255, 144, + 61, 182, 1, 0, 0, 0, 68, 79, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, 144, 1, 0, 0, 4, 2, @@ -947,11 +947,11 @@ const BYTE shader_d3d11_sharpen[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 148, 46, 49, 1, 56, 189, - 231, 96, 1, 0, 0, 0, - 1, 203, 195, 108, 169, 234, - 202, 66, 168, 100, 31, 73, - 237, 76, 153, 198, 0, 0, + 148, 46, 49, 1, 36, 7, + 244, 96, 1, 0, 0, 0, + 161, 204, 179, 45, 217, 227, + 248, 73, 128, 253, 84, 179, + 98, 141, 156, 222, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, @@ -1032,99 +1032,99 @@ const BYTE shader_d3d11_sharpen[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 116, 32, 80, 105, - 120, 101, 108, 83, 104, 97, - 100, 101, 114, 73, 110, 112, - 117, 116, 13, 10, 123, 13, - 10, 32, 32, 32, 32, 102, - 108, 111, 97, 116, 52, 32, - 112, 111, 115, 32, 32, 32, - 58, 32, 83, 86, 95, 80, - 79, 83, 73, 84, 73, 79, - 78, 59, 13, 10, 32, 32, - 32, 32, 102, 108, 111, 97, - 116, 50, 32, 117, 118, 32, - 32, 32, 32, 58, 32, 84, - 69, 88, 67, 79, 79, 82, - 68, 48, 59, 13, 10, 32, + 0, 0, 123, 13, 10, 32, 32, 32, 32, 102, 108, 111, - 97, 116, 52, 32, 99, 111, - 108, 111, 114, 32, 58, 32, - 67, 79, 76, 79, 82, 48, - 59, 13, 10, 125, 59, 13, - 10, 13, 10, 47, 47, 32, - 117, 110, 115, 104, 97, 114, - 112, 32, 58, 48, 46, 48, - 32, 116, 111, 32, 49, 48, - 46, 48, 13, 10, 102, 108, - 111, 97, 116, 52, 32, 109, - 97, 105, 110, 40, 80, 105, - 120, 101, 108, 83, 104, 97, - 100, 101, 114, 73, 110, 112, - 117, 116, 32, 105, 110, 112, - 117, 116, 41, 32, 58, 32, - 83, 86, 95, 84, 97, 114, - 103, 101, 116, 13, 10, 123, + 97, 116, 52, 32, 112, 111, + 115, 32, 32, 32, 58, 32, + 83, 86, 95, 80, 79, 83, + 73, 84, 73, 79, 78, 59, 13, 10, 32, 32, 32, 32, 102, 108, 111, 97, 116, 50, - 32, 112, 115, 32, 61, 32, - 102, 108, 111, 97, 116, 50, - 40, 49, 46, 48, 32, 47, - 32, 119, 105, 100, 116, 104, - 44, 32, 49, 46, 48, 32, - 47, 32, 104, 101, 105, 103, - 104, 116, 41, 59, 13, 10, + 32, 117, 118, 32, 32, 32, + 32, 58, 32, 84, 69, 88, + 67, 79, 79, 82, 68, 48, + 59, 13, 10, 32, 32, 32, + 32, 102, 108, 111, 97, 116, + 52, 32, 99, 111, 108, 111, + 114, 32, 58, 32, 67, 79, + 76, 79, 82, 48, 59, 13, + 10, 125, 59, 13, 10, 13, + 10, 47, 47, 32, 117, 110, + 115, 104, 97, 114, 112, 32, + 58, 48, 46, 48, 32, 116, + 111, 32, 49, 48, 46, 48, + 13, 10, 102, 108, 111, 97, + 116, 52, 32, 109, 97, 105, + 110, 40, 80, 105, 120, 101, + 108, 83, 104, 97, 100, 101, + 114, 73, 110, 112, 117, 116, + 32, 105, 110, 112, 117, 116, + 41, 32, 58, 32, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 13, 10, 123, 13, 10, 32, 32, 32, 32, 102, 108, - 111, 97, 116, 50, 32, 115, - 116, 49, 32, 61, 32, 112, - 115, 32, 42, 32, 49, 46, - 50, 59, 13, 10, 32, 32, + 111, 97, 116, 50, 32, 112, + 115, 32, 61, 32, 102, 108, + 111, 97, 116, 50, 40, 49, + 46, 48, 32, 47, 32, 119, + 105, 100, 116, 104, 44, 32, + 49, 46, 48, 32, 47, 32, + 104, 101, 105, 103, 104, 116, + 41, 59, 13, 10, 32, 32, 32, 32, 102, 108, 111, 97, - 116, 52, 32, 112, 32, 61, + 116, 50, 32, 115, 116, 49, + 32, 61, 32, 112, 115, 32, + 42, 32, 49, 46, 50, 59, + 13, 10, 32, 32, 32, 32, + 102, 108, 111, 97, 116, 52, + 32, 112, 32, 61, 32, 84, + 101, 120, 116, 117, 114, 101, + 46, 83, 97, 109, 112, 108, + 101, 40, 80, 111, 105, 110, + 116, 83, 97, 109, 112, 108, + 101, 114, 44, 32, 105, 110, + 112, 117, 116, 46, 117, 118, + 41, 59, 13, 10, 32, 32, + 32, 32, 102, 108, 111, 97, + 116, 52, 32, 115, 117, 109, + 49, 32, 61, 32, 84, 101, + 120, 116, 117, 114, 101, 46, + 83, 97, 109, 112, 108, 101, + 40, 80, 111, 105, 110, 116, + 83, 97, 109, 112, 108, 101, + 114, 44, 32, 105, 110, 112, + 117, 116, 46, 117, 118, 32, + 43, 32, 115, 116, 49, 32, + 42, 32, 102, 108, 111, 97, + 116, 50, 40, 43, 49, 44, + 32, 43, 49, 41, 41, 13, + 10, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 43, 32, 84, 101, 120, 116, 117, 114, 101, 46, 83, 97, 109, 112, 108, 101, 40, 80, 111, 105, 110, 116, 83, 97, 109, 112, 108, 101, 114, 44, 32, 105, 110, 112, 117, 116, 46, - 117, 118, 41, 59, 13, 10, - 32, 32, 32, 32, 102, 108, - 111, 97, 116, 52, 32, 115, - 117, 109, 49, 32, 61, 32, - 84, 101, 120, 116, 117, 114, - 101, 46, 83, 97, 109, 112, - 108, 101, 40, 80, 111, 105, - 110, 116, 83, 97, 109, 112, - 108, 101, 114, 44, 32, 105, - 110, 112, 117, 116, 46, 117, - 118, 32, 43, 32, 115, 116, - 49, 32, 42, 32, 102, 108, - 111, 97, 116, 50, 40, 43, - 49, 44, 32, 43, 49, 41, - 41, 13, 10, 32, 32, 32, - 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, - 32, 43, 32, 84, 101, 120, - 116, 117, 114, 101, 46, 83, - 97, 109, 112, 108, 101, 40, - 80, 111, 105, 110, 116, 83, - 97, 109, 112, 108, 101, 114, - 44, 32, 105, 110, 112, 117, - 116, 46, 117, 118, 32, 43, - 32, 115, 116, 49, 32, 42, - 32, 102, 108, 111, 97, 116, - 50, 40, 43, 49, 44, 32, - 45, 49, 41, 41, 13, 10, + 117, 118, 32, 43, 32, 115, + 116, 49, 32, 42, 32, 102, + 108, 111, 97, 116, 50, 40, + 43, 49, 44, 32, 45, 49, + 41, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 198, 90, + 32, 32, 43, 32, 84, 101, + 120, 116, 117, 114, 101, 46, + 83, 97, 109, 112, 108, 101, + 40, 80, 111, 105, 198, 90, 0, 0, 117, 131, 1, 0, 142, 60, 1, 0, 47, 63, 0, 0, 38, 247, 2, 0, 65, 36, 1, 0, 39, 82, - 3, 0, 189, 191, 1, 0, + 3, 0, 1, 40, 2, 0, 217, 42, 2, 0, 21, 230, - 0, 0, 191, 77, 0, 0, + 0, 0, 139, 73, 0, 0, 73, 20, 1, 0, 153, 189, 3, 0, 146, 230, 3, 0, 177, 197, 0, 0, 0, 16, @@ -1460,93 +1460,93 @@ const BYTE shader_d3d11_sharpen[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 239, 254, 239, 1, 0, - 0, 0, 86, 6, 0, 0, - 0, 71, 58, 92, 118, 105, + 0, 0, 66, 6, 0, 0, + 0, 71, 58, 92, 103, 105, + 116, 49, 92, 118, 105, 100, + 101, 111, 45, 114, 101, 110, + 100, 101, 114, 101, 114, 92, + 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, 101, 114, + 92, 115, 104, 97, 100, 101, + 114, 92, 100, 51, 100, 49, + 49, 92, 100, 51, 100, 49, + 49, 95, 115, 104, 97, 114, + 112, 101, 110, 46, 104, 108, + 115, 108, 0, 0, 103, 58, + 92, 103, 105, 116, 49, 92, + 118, 105, 100, 101, 111, 45, + 114, 101, 110, 100, 101, 114, + 101, 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, - 114, 101, 114, 92, 115, 114, - 99, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 104, 97, 100, 101, 114, 92, - 100, 51, 100, 49, 49, 92, - 100, 51, 100, 49, 49, 95, - 115, 104, 97, 114, 112, 101, - 110, 46, 104, 108, 115, 108, - 0, 0, 103, 58, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 114, 99, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 104, 97, 100, 101, 114, - 92, 100, 51, 100, 49, 49, - 92, 100, 51, 100, 49, 49, - 95, 115, 104, 97, 114, 112, - 101, 110, 46, 104, 108, 115, - 108, 0, 47, 47, 32, 109, - 112, 118, 32, 115, 104, 97, - 100, 101, 114, 44, 32, 104, - 116, 116, 112, 115, 58, 47, - 47, 103, 105, 116, 104, 117, - 98, 46, 99, 111, 109, 47, - 109, 112, 118, 45, 112, 108, - 97, 121, 101, 114, 47, 109, - 112, 118, 47, 98, 108, 111, - 98, 47, 109, 97, 115, 116, - 101, 114, 47, 118, 105, 100, - 101, 111, 47, 111, 117, 116, - 47, 103, 112, 117, 47, 118, - 105, 100, 101, 111, 95, 115, - 104, 97, 100, 101, 114, 115, - 46, 99, 13, 10, 13, 10, - 84, 101, 120, 116, 117, 114, - 101, 50, 68, 32, 84, 101, - 120, 116, 117, 114, 101, 32, - 58, 32, 114, 101, 103, 105, - 115, 116, 101, 114, 40, 116, - 48, 41, 59, 13, 10, 13, + 114, 101, 114, 92, 115, 104, + 97, 100, 101, 114, 92, 100, + 51, 100, 49, 49, 92, 100, + 51, 100, 49, 49, 95, 115, + 104, 97, 114, 112, 101, 110, + 46, 104, 108, 115, 108, 0, + 47, 47, 32, 109, 112, 118, + 32, 115, 104, 97, 100, 101, + 114, 44, 32, 104, 116, 116, + 112, 115, 58, 47, 47, 103, + 105, 116, 104, 117, 98, 46, + 99, 111, 109, 47, 109, 112, + 118, 45, 112, 108, 97, 121, + 101, 114, 47, 109, 112, 118, + 47, 98, 108, 111, 98, 47, + 109, 97, 115, 116, 101, 114, + 47, 118, 105, 100, 101, 111, + 47, 111, 117, 116, 47, 103, + 112, 117, 47, 118, 105, 100, + 101, 111, 95, 115, 104, 97, + 100, 101, 114, 115, 46, 99, + 13, 10, 13, 10, 84, 101, + 120, 116, 117, 114, 101, 50, + 68, 32, 84, 101, 120, 116, + 117, 114, 101, 32, 58, 32, + 114, 101, 103, 105, 115, 116, + 101, 114, 40, 116, 48, 41, + 59, 13, 10, 13, 10, 83, + 97, 109, 112, 108, 101, 114, + 83, 116, 97, 116, 101, 32, + 76, 105, 110, 101, 97, 114, + 83, 97, 109, 112, 108, 101, + 114, 32, 58, 32, 114, 101, + 103, 105, 115, 116, 101, 114, + 40, 115, 48, 41, 59, 13, 10, 83, 97, 109, 112, 108, 101, 114, 83, 116, 97, 116, - 101, 32, 76, 105, 110, 101, - 97, 114, 83, 97, 109, 112, - 108, 101, 114, 32, 58, 32, + 101, 32, 80, 111, 105, 110, + 116, 83, 97, 109, 112, 108, + 101, 114, 32, 32, 58, 32, 114, 101, 103, 105, 115, 116, - 101, 114, 40, 115, 48, 41, - 59, 13, 10, 83, 97, 109, - 112, 108, 101, 114, 83, 116, - 97, 116, 101, 32, 80, 111, - 105, 110, 116, 83, 97, 109, - 112, 108, 101, 114, 32, 32, - 58, 32, 114, 101, 103, 105, - 115, 116, 101, 114, 40, 115, - 49, 41, 59, 13, 10, 13, - 10, 99, 98, 117, 102, 102, - 101, 114, 32, 83, 104, 97, - 114, 112, 101, 110, 80, 97, - 114, 97, 109, 115, 32, 58, - 32, 114, 101, 103, 105, 115, - 116, 101, 114, 40, 98, 48, - 41, 13, 10, 123, 13, 10, - 32, 32, 32, 32, 102, 108, - 111, 97, 116, 32, 119, 105, - 100, 116, 104, 59, 13, 10, - 32, 32, 32, 32, 102, 108, - 111, 97, 116, 32, 104, 101, - 105, 103, 104, 116, 59, 13, - 10, 32, 32, 32, 32, 102, - 108, 111, 97, 116, 32, 117, - 110, 115, 104, 97, 114, 112, - 59, 13, 10, 125, 59, 13, - 10, 13, 10, 115, 116, 114, - 117, 99, 27, 226, 48, 1, - 128, 0, 0, 0, 198, 183, - 95, 107, 111, 116, 215, 1, + 101, 114, 40, 115, 49, 41, + 59, 13, 10, 13, 10, 99, + 98, 117, 102, 102, 101, 114, + 32, 83, 104, 97, 114, 112, + 101, 110, 80, 97, 114, 97, + 109, 115, 32, 58, 32, 114, + 101, 103, 105, 115, 116, 101, + 114, 40, 98, 48, 41, 13, + 10, 123, 13, 10, 32, 32, + 32, 32, 102, 108, 111, 97, + 116, 32, 119, 105, 100, 116, + 104, 59, 13, 10, 32, 32, + 32, 32, 102, 108, 111, 97, + 116, 32, 104, 101, 105, 103, + 104, 116, 59, 13, 10, 32, + 32, 32, 32, 102, 108, 111, + 97, 116, 32, 117, 110, 115, + 104, 97, 114, 112, 59, 13, + 10, 125, 59, 13, 10, 13, + 10, 115, 116, 114, 117, 99, + 116, 32, 80, 105, 120, 101, + 108, 83, 104, 97, 100, 101, + 114, 73, 110, 112, 117, 116, + 13, 10, 27, 226, 48, 1, + 128, 0, 0, 0, 12, 16, + 213, 136, 194, 123, 215, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1558,12 +1558,12 @@ const BYTE shader_d3d11_sharpen[] = 1, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 86, 0, 0, 0, + 0, 0, 76, 0, 0, 0, 40, 0, 0, 0, 27, 226, 48, 1, 191, 114, 234, 163, 171, 5, 0, 0, 1, 0, - 0, 0, 85, 0, 0, 0, - 86, 0, 0, 0, 0, 0, + 0, 0, 75, 0, 0, 0, + 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2182,14 +2182,14 @@ const BYTE shader_d3d11_sharpen[] = 5, 16, 0, 0, 23, 0, 1, 0, 4, 16, 0, 0, 14, 0, 23, 21, 0, 16, - 0, 0, 3, 2, 48, 3, + 0, 0, 3, 2, 176, 0, 0, 0, 242, 241, 10, 0, 24, 21, 7, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, 8, 16, 0, 0, 1, 0, 0, 2, 14, 0, 23, 21, 0, 0, 0, 0, - 10, 2, 48, 3, 0, 0, + 10, 2, 176, 0, 0, 0, 242, 241, 10, 0, 24, 21, 10, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, @@ -2312,20 +2312,35 @@ const BYTE shader_d3d11_sharpen[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 43, 32, 84, 101, - 120, 116, 117, 114, 101, 46, - 83, 97, 109, 112, 108, 101, - 40, 80, 111, 105, 110, 116, - 83, 97, 109, 112, 108, 101, - 114, 44, 32, 105, 110, 112, - 117, 116, 46, 117, 118, 32, - 43, 32, 115, 116, 49, 32, - 42, 32, 102, 108, 111, 97, - 116, 50, 40, 45, 49, 44, - 32, 43, 49, 41, 41, 13, - 10, 32, 32, 32, 32, 32, + 0, 0, 110, 116, 83, 97, + 109, 112, 108, 101, 114, 44, + 32, 105, 110, 112, 117, 116, + 46, 117, 118, 32, 43, 32, + 115, 116, 49, 32, 42, 32, + 102, 108, 111, 97, 116, 50, + 40, 45, 49, 44, 32, 43, + 49, 41, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 43, + 32, 32, 32, 32, 32, 32, + 32, 32, 32, 43, 32, 84, + 101, 120, 116, 117, 114, 101, + 46, 83, 97, 109, 112, 108, + 101, 40, 80, 111, 105, 110, + 116, 83, 97, 109, 112, 108, + 101, 114, 44, 32, 105, 110, + 112, 117, 116, 46, 117, 118, + 32, 43, 32, 115, 116, 49, + 32, 42, 32, 102, 108, 111, + 97, 116, 50, 40, 45, 49, + 44, 32, 45, 49, 41, 41, + 59, 13, 10, 32, 32, 32, + 32, 102, 108, 111, 97, 116, + 50, 32, 115, 116, 50, 32, + 61, 32, 112, 115, 32, 42, + 32, 49, 46, 53, 59, 13, + 10, 32, 32, 32, 32, 102, + 108, 111, 97, 116, 52, 32, + 115, 117, 109, 50, 32, 61, 32, 84, 101, 120, 116, 117, 114, 101, 46, 83, 97, 109, 112, 108, 101, 40, 80, 111, @@ -2333,28 +2348,23 @@ const BYTE shader_d3d11_sharpen[] = 112, 108, 101, 114, 44, 32, 105, 110, 112, 117, 116, 46, 117, 118, 32, 43, 32, 115, - 116, 49, 32, 42, 32, 102, + 116, 50, 32, 42, 32, 102, 108, 111, 97, 116, 50, 40, - 45, 49, 44, 32, 45, 49, - 41, 41, 59, 13, 10, 32, - 32, 32, 32, 102, 108, 111, - 97, 116, 50, 32, 115, 116, - 50, 32, 61, 32, 112, 115, - 32, 42, 32, 49, 46, 53, - 59, 13, 10, 32, 32, 32, - 32, 102, 108, 111, 97, 116, - 52, 32, 115, 117, 109, 50, - 32, 61, 32, 84, 101, 120, - 116, 117, 114, 101, 46, 83, - 97, 109, 112, 108, 101, 40, - 80, 111, 105, 110, 116, 83, - 97, 109, 112, 108, 101, 114, - 44, 32, 105, 110, 112, 117, - 116, 46, 117, 118, 32, 43, - 32, 115, 116, 50, 32, 42, - 32, 102, 108, 111, 97, 116, - 50, 40, 43, 49, 44, 32, - 32, 48, 41, 41, 13, 10, + 43, 49, 44, 32, 32, 48, + 41, 41, 13, 10, 32, 32, + 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, + 32, 32, 43, 32, 84, 101, + 120, 116, 117, 114, 101, 46, + 83, 97, 109, 112, 108, 101, + 40, 80, 111, 105, 110, 116, + 83, 97, 109, 112, 108, 101, + 114, 44, 32, 105, 110, 112, + 117, 116, 46, 117, 118, 32, + 43, 32, 115, 116, 50, 32, + 42, 32, 102, 108, 111, 97, + 116, 50, 40, 48, 44, 32, + 43, 49, 41, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 43, 32, @@ -2366,60 +2376,50 @@ const BYTE shader_d3d11_sharpen[] = 110, 112, 117, 116, 46, 117, 118, 32, 43, 32, 115, 116, 50, 32, 42, 32, 102, 108, - 111, 97, 116, 50, 40, 48, - 44, 32, 43, 49, 41, 41, - 13, 10, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, - 43, 32, 84, 101, 120, 116, - 117, 114, 101, 46, 83, 97, - 109, 112, 108, 101, 40, 80, - 111, 105, 110, 116, 83, 97, - 109, 112, 108, 101, 114, 44, - 32, 105, 110, 112, 117, 116, - 46, 117, 118, 32, 43, 32, - 115, 116, 50, 32, 42, 32, - 102, 108, 111, 97, 116, 50, - 40, 45, 49, 44, 32, 32, - 48, 41, 41, 13, 10, 32, + 111, 97, 116, 50, 40, 45, + 49, 44, 32, 32, 48, 41, + 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 43, 32, 84, - 101, 120, 116, 117, 114, 101, - 46, 83, 97, 109, 112, 108, - 101, 40, 80, 111, 105, 110, - 116, 83, 97, 109, 112, 108, - 101, 114, 44, 32, 105, 110, - 112, 117, 116, 46, 117, 118, - 32, 43, 32, 115, 116, 50, - 32, 42, 32, 102, 108, 111, - 97, 116, 50, 40, 48, 44, - 32, 45, 49, 41, 41, 59, - 13, 10, 32, 32, 32, 32, - 102, 108, 111, 97, 116, 52, - 32, 116, 32, 61, 32, 112, - 32, 42, 32, 48, 46, 56, - 53, 57, 51, 55, 53, 32, - 43, 32, 115, 117, 109, 50, + 32, 43, 32, 84, 101, 120, + 116, 117, 114, 101, 46, 83, + 97, 109, 112, 108, 101, 40, + 80, 111, 105, 110, 116, 83, + 97, 109, 112, 108, 101, 114, + 44, 32, 105, 110, 112, 117, + 116, 46, 117, 118, 32, 43, + 32, 115, 116, 50, 32, 42, + 32, 102, 108, 111, 97, 116, + 50, 40, 48, 44, 32, 45, + 49, 41, 41, 59, 13, 10, + 32, 32, 32, 32, 102, 108, + 111, 97, 116, 52, 32, 116, + 32, 61, 32, 112, 32, 42, + 32, 48, 46, 56, 53, 57, + 51, 55, 53, 32, 43, 32, + 115, 117, 109, 50, 32, 42, + 32, 45, 48, 46, 49, 49, + 55, 49, 56, 55, 53, 32, + 43, 32, 115, 117, 109, 49, 32, 42, 32, 45, 48, 46, - 49, 49, 55, 49, 56, 55, - 53, 32, 43, 32, 115, 117, - 109, 49, 32, 42, 32, 45, - 48, 46, 48, 57, 55, 54, - 53, 54, 50, 53, 59, 13, - 10, 32, 32, 32, 32, 114, - 101, 116, 117, 114, 110, 32, - 102, 108, 111, 97, 116, 52, - 40, 112, 32, 43, 32, 116, - 32, 42, 32, 117, 110, 115, - 104, 97, 114, 112, 41, 59, - 13, 10, 125, 13, 10, 0, - 7, 0, 0, 0, 170, 0, - 0, 0, 85, 0, 0, 0, + 48, 57, 55, 54, 53, 54, + 50, 53, 59, 13, 10, 32, + 32, 32, 32, 114, 101, 116, + 117, 114, 110, 32, 102, 108, + 111, 97, 116, 52, 40, 112, + 32, 43, 32, 116, 32, 42, + 32, 117, 110, 115, 104, 97, + 114, 112, 41, 59, 13, 10, + 125, 13, 10, 0, 7, 0, + 0, 0, 0, 0, 0, 0, + 75, 0, 0, 0, 0, 0, + 0, 0, 76, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 150, 0, 0, 0, + 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 86, 0, - 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2915,7 +2915,7 @@ const BYTE shader_d3d11_sharpen[] = 0, 142, 14, 0, 63, 92, 15, 0, 0, 0, 76, 0, 0, 0, 32, 0, 0, 0, - 44, 0, 0, 0, 96, 0, + 44, 0, 0, 0, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 25, 0, 0, 0, @@ -2924,19 +2924,19 @@ const BYTE shader_d3d11_sharpen[] = 1, 0, 0, 0, 0, 0, 0, 0, 128, 6, 0, 0, 32, 0, 0, 96, 0, 0, - 0, 0, 0, 0, 0, 0, + 156, 222, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 9, 0, 176, 5, 0, 0, 0, 0, 0, 0, 20, 5, 0, 0, 1, 0, 0, 0, - 136, 175, 110, 3, 0, 0, + 80, 100, 249, 2, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 105, 110, 0, 110, 111, 110, 101, 0, 0, 0, 45, 186, 46, 241, 1, 0, 0, 0, 0, 0, 0, 0, 128, 6, 0, 0, 32, 0, - 0, 96, 0, 0, 0, 0, + 0, 96, 0, 0, 156, 222, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 7, 0, 0, 0, 0, 0, @@ -2948,28 +2948,28 @@ const BYTE shader_d3d11_sharpen[] = 255, 255, 255, 255, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 71, 58, + 92, 103, 105, 116, 49, 92, + 118, 105, 100, 101, 111, 45, + 114, 101, 110, 100, 101, 114, + 101, 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, - 114, 101, 114, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 114, 99, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 104, 97, 100, - 101, 114, 92, 100, 51, 100, - 49, 49, 92, 100, 51, 100, - 49, 49, 95, 115, 104, 97, - 114, 112, 101, 110, 46, 104, - 108, 115, 108, 0, 254, 239, - 254, 239, 1, 0, 0, 0, - 1, 0, 0, 0, 0, 1, + 114, 101, 114, 92, 115, 104, + 97, 100, 101, 114, 92, 100, + 51, 100, 49, 49, 92, 100, + 51, 100, 49, 49, 95, 115, + 104, 97, 114, 112, 101, 110, + 46, 104, 108, 115, 108, 0, + 0, 0, 254, 239, 254, 239, + 1, 0, 0, 0, 1, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 255, + 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 12, 0, 255, + 255, 12, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 0, 0, 0, + 255, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2995,11 +2995,11 @@ const BYTE shader_d3d11_sharpen[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 148, 46, 49, 1, 56, 189, - 231, 96, 1, 0, 0, 0, - 1, 203, 195, 108, 169, 234, - 202, 66, 168, 100, 31, 73, - 237, 76, 153, 198, 129, 0, + 148, 46, 49, 1, 36, 7, + 244, 96, 1, 0, 0, 0, + 161, 204, 179, 45, 217, 227, + 248, 73, 128, 253, 84, 179, + 98, 141, 156, 222, 119, 0, 0, 0, 47, 76, 105, 110, 107, 73, 110, 102, 111, 0, 47, 110, 97, 109, 101, 115, @@ -3008,30 +3008,30 @@ const BYTE shader_d3d11_sharpen[] = 98, 108, 111, 99, 107, 0, 47, 115, 114, 99, 47, 102, 105, 108, 101, 115, 47, 103, - 58, 92, 118, 105, 100, 101, + 58, 92, 103, 105, 116, 49, + 92, 118, 105, 100, 101, 111, + 45, 114, 101, 110, 100, 101, + 114, 101, 114, 92, 115, 114, + 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 114, 99, 92, - 118, 105, 100, 101, 111, 45, - 114, 101, 110, 100, 101, 114, - 101, 114, 92, 115, 104, 97, - 100, 101, 114, 92, 100, 51, - 100, 49, 49, 92, 100, 51, - 100, 49, 49, 95, 115, 104, - 97, 114, 112, 101, 110, 46, - 104, 108, 115, 108, 0, 4, - 0, 0, 0, 6, 0, 0, - 0, 1, 0, 0, 0, 30, - 0, 0, 0, 0, 0, 0, - 0, 17, 0, 0, 0, 7, - 0, 0, 0, 34, 0, 0, - 0, 8, 0, 0, 0, 10, + 101, 114, 101, 114, 92, 115, + 104, 97, 100, 101, 114, 92, + 100, 51, 100, 49, 49, 92, + 100, 51, 100, 49, 49, 95, + 115, 104, 97, 114, 112, 101, + 110, 46, 104, 108, 115, 108, + 0, 4, 0, 0, 0, 6, + 0, 0, 0, 1, 0, 0, + 0, 58, 0, 0, 0, 0, + 0, 0, 0, 17, 0, 0, + 0, 7, 0, 0, 0, 10, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 5, + 0, 0, 0, 34, 0, 0, + 0, 8, 0, 0, 0, 0, + 0, 0, 0, 220, 81, 51, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 220, 81, 51, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3081,11 +3081,11 @@ const BYTE shader_d3d11_sharpen[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, - 32, 0, 0, 0, 221, 0, + 32, 0, 0, 0, 211, 0, 0, 0, 84, 1, 0, 0, - 103, 1, 0, 0, 56, 0, + 95, 1, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, - 134, 6, 0, 0, 128, 0, + 114, 6, 0, 0, 128, 0, 0, 0, 171, 5, 0, 0, 224, 10, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, diff --git a/src/video-renderer/shader/d3d11/shader_d3d11_vertex.h b/src/video-renderer/shader/d3d11/shader_d3d11_vertex.h index 50202c0..b8e1d99 100644 --- a/src/video-renderer/shader/d3d11/shader_d3d11_vertex.h +++ b/src/video-renderer/shader/d3d11/shader_d3d11_vertex.h @@ -57,7 +57,7 @@ dcl_temps 3 // o1.x <-
.uv.x; o1.y <-
.uv.y; // o0.x <-
.pos.x; o0.y <-
.pos.y; o0.z <-
.pos.z; o0.w <-
.pos.w // -#line 24 "G:\video-renderer\video-renderer\src\video-renderer\shader\d3d11\d3d11_vertex.hlsl" +#line 24 "G:\git1\video-renderer\src\video-renderer\shader\d3d11\d3d11_vertex.hlsl" mov r0.xyz, v0.xyzx // r0.x <- pos.x; r0.y <- pos.y; r0.z <- pos.z mov r0.w, l(1.000000) // r0.w <- pos.w @@ -92,10 +92,10 @@ ret const BYTE shader_d3d11_vertex[] = { - 68, 88, 66, 67, 68, 76, - 251, 157, 87, 37, 112, 164, - 255, 221, 245, 134, 81, 251, - 205, 104, 1, 0, 0, 0, + 68, 88, 66, 67, 204, 255, + 87, 41, 7, 57, 57, 47, + 76, 228, 140, 25, 130, 164, + 65, 217, 1, 0, 0, 0, 168, 58, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, 40, 1, 0, 0, 152, 1, @@ -718,10 +718,10 @@ const BYTE shader_d3d11_vertex[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 46, 49, 1, - 71, 188, 231, 96, 1, 0, - 0, 0, 146, 145, 161, 25, - 166, 165, 97, 76, 145, 91, - 35, 95, 249, 79, 70, 116, + 36, 7, 244, 96, 1, 0, + 0, 0, 237, 56, 90, 236, + 17, 212, 44, 78, 150, 0, + 153, 138, 205, 147, 230, 247, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, @@ -802,62 +802,62 @@ const BYTE shader_d3d11_vertex[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 104, 97, - 100, 101, 114, 79, 117, 116, - 112, 117, 116, 32, 109, 97, - 105, 110, 40, 86, 101, 114, - 116, 101, 120, 83, 104, 97, - 100, 101, 114, 73, 110, 112, - 117, 116, 32, 105, 110, 112, - 117, 116, 41, 13, 10, 123, - 13, 10, 9, 86, 101, 114, - 116, 101, 120, 83, 104, 97, - 100, 101, 114, 79, 117, 116, - 112, 117, 116, 32, 111, 117, - 116, 112, 117, 116, 32, 61, - 32, 40, 86, 101, 114, 116, - 101, 120, 83, 104, 97, 100, - 101, 114, 79, 117, 116, 112, - 117, 116, 41, 48, 59, 13, - 10, 9, 102, 108, 111, 97, - 116, 52, 32, 112, 111, 115, - 32, 61, 32, 102, 108, 111, - 97, 116, 52, 40, 105, 110, - 112, 117, 116, 46, 112, 111, - 115, 44, 32, 49, 46, 48, - 102, 41, 59, 13, 10, 13, - 10, 9, 112, 111, 115, 32, - 61, 32, 109, 117, 108, 40, - 112, 111, 115, 44, 32, 118, - 105, 101, 119, 41, 59, 13, - 10, 9, 112, 111, 115, 32, - 61, 32, 109, 117, 108, 40, - 112, 111, 115, 44, 32, 112, - 114, 111, 106, 101, 99, 116, - 105, 111, 110, 41, 59, 13, - 10, 13, 10, 9, 111, 117, - 116, 112, 117, 116, 46, 112, - 111, 115, 32, 61, 32, 112, - 111, 115, 59, 13, 10, 9, - 111, 117, 116, 112, 117, 116, - 46, 117, 118, 32, 61, 32, - 105, 110, 112, 117, 116, 46, - 117, 118, 59, 13, 10, 9, - 111, 117, 116, 112, 117, 116, + 0, 0, 0, 0, 116, 101, + 120, 83, 104, 97, 100, 101, + 114, 73, 110, 112, 117, 116, + 32, 105, 110, 112, 117, 116, + 41, 13, 10, 123, 13, 10, + 9, 86, 101, 114, 116, 101, + 120, 83, 104, 97, 100, 101, + 114, 79, 117, 116, 112, 117, + 116, 32, 111, 117, 116, 112, + 117, 116, 32, 61, 32, 40, + 86, 101, 114, 116, 101, 120, + 83, 104, 97, 100, 101, 114, + 79, 117, 116, 112, 117, 116, + 41, 48, 59, 13, 10, 9, + 102, 108, 111, 97, 116, 52, + 32, 112, 111, 115, 32, 61, + 32, 102, 108, 111, 97, 116, + 52, 40, 105, 110, 112, 117, + 116, 46, 112, 111, 115, 44, + 32, 49, 46, 48, 102, 41, + 59, 13, 10, 13, 10, 9, + 112, 111, 115, 32, 61, 32, + 109, 117, 108, 40, 112, 111, + 115, 44, 32, 118, 105, 101, + 119, 41, 59, 13, 10, 9, + 112, 111, 115, 32, 61, 32, + 109, 117, 108, 40, 112, 111, + 115, 44, 32, 112, 114, 111, + 106, 101, 99, 116, 105, 111, + 110, 41, 59, 13, 10, 13, + 10, 9, 111, 117, 116, 112, + 117, 116, 46, 112, 111, 115, + 32, 61, 32, 112, 111, 115, + 59, 13, 10, 9, 111, 117, + 116, 112, 117, 116, 46, 117, + 118, 32, 61, 32, 105, 110, + 112, 117, 116, 46, 117, 118, + 59, 13, 10, 9, 111, 117, + 116, 112, 117, 116, 46, 99, + 111, 108, 111, 114, 32, 61, + 32, 105, 110, 112, 117, 116, 46, 99, 111, 108, 111, 114, - 32, 61, 32, 105, 110, 112, - 117, 116, 46, 99, 111, 108, - 111, 114, 59, 13, 10, 13, - 10, 9, 114, 101, 116, 117, - 114, 110, 32, 111, 117, 116, - 112, 117, 116, 59, 13, 10, - 125, 13, 10, 0, 7, 0, + 59, 13, 10, 13, 10, 9, + 114, 101, 116, 117, 114, 110, + 32, 111, 117, 116, 112, 117, + 116, 59, 13, 10, 125, 13, + 10, 0, 7, 0, 0, 0, + 0, 0, 0, 0, 74, 0, + 0, 0, 75, 0, 0, 0, + 148, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 84, 0, 0, 0, 168, 0, - 0, 0, 1, 0, 0, 0, - 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1145,93 +1145,93 @@ const BYTE shader_d3d11_vertex[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 239, 254, 239, 1, 0, - 0, 0, 26, 3, 0, 0, - 0, 71, 58, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 118, 105, 100, 101, 111, - 45, 114, 101, 110, 100, 101, - 114, 101, 114, 92, 115, 114, - 99, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 104, 97, 100, 101, 114, 92, - 100, 51, 100, 49, 49, 92, - 100, 51, 100, 49, 49, 95, - 118, 101, 114, 116, 101, 120, - 46, 104, 108, 115, 108, 0, - 0, 103, 58, 92, 118, 105, + 0, 0, 6, 3, 0, 0, + 0, 71, 58, 92, 103, 105, + 116, 49, 92, 118, 105, 100, + 101, 111, 45, 114, 101, 110, + 100, 101, 114, 101, 114, 92, + 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, 101, 114, - 92, 118, 105, 100, 101, 111, - 45, 114, 101, 110, 100, 101, - 114, 101, 114, 92, 115, 114, - 99, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 104, 97, 100, 101, 114, 92, - 100, 51, 100, 49, 49, 92, - 100, 51, 100, 49, 49, 95, - 118, 101, 114, 116, 101, 120, - 46, 104, 108, 115, 108, 0, - 99, 98, 117, 102, 102, 101, - 114, 32, 86, 101, 114, 116, - 101, 120, 83, 104, 97, 100, - 101, 114, 67, 111, 110, 115, - 116, 97, 110, 116, 115, 32, - 58, 32, 114, 101, 103, 105, - 115, 116, 101, 114, 40, 98, - 48, 41, 13, 10, 123, 13, - 10, 9, 109, 97, 116, 114, - 105, 120, 32, 118, 105, 101, - 119, 59, 13, 10, 9, 109, - 97, 116, 114, 105, 120, 32, - 112, 114, 111, 106, 101, 99, - 116, 105, 111, 110, 59, 13, - 10, 125, 59, 13, 10, 13, - 10, 115, 116, 114, 117, 99, - 116, 32, 86, 101, 114, 116, - 101, 120, 83, 104, 97, 100, - 101, 114, 73, 110, 112, 117, + 92, 115, 104, 97, 100, 101, + 114, 92, 100, 51, 100, 49, + 49, 92, 100, 51, 100, 49, + 49, 95, 118, 101, 114, 116, + 101, 120, 46, 104, 108, 115, + 108, 0, 0, 103, 58, 92, + 103, 105, 116, 49, 92, 118, + 105, 100, 101, 111, 45, 114, + 101, 110, 100, 101, 114, 101, + 114, 92, 115, 114, 99, 92, + 118, 105, 100, 101, 111, 45, + 114, 101, 110, 100, 101, 114, + 101, 114, 92, 115, 104, 97, + 100, 101, 114, 92, 100, 51, + 100, 49, 49, 92, 100, 51, + 100, 49, 49, 95, 118, 101, + 114, 116, 101, 120, 46, 104, + 108, 115, 108, 0, 99, 98, + 117, 102, 102, 101, 114, 32, + 86, 101, 114, 116, 101, 120, + 83, 104, 97, 100, 101, 114, + 67, 111, 110, 115, 116, 97, + 110, 116, 115, 32, 58, 32, + 114, 101, 103, 105, 115, 116, + 101, 114, 40, 98, 48, 41, + 13, 10, 123, 13, 10, 9, + 109, 97, 116, 114, 105, 120, + 32, 118, 105, 101, 119, 59, + 13, 10, 9, 109, 97, 116, + 114, 105, 120, 32, 112, 114, + 111, 106, 101, 99, 116, 105, + 111, 110, 59, 13, 10, 125, + 59, 13, 10, 13, 10, 115, + 116, 114, 117, 99, 116, 32, + 86, 101, 114, 116, 101, 120, + 83, 104, 97, 100, 101, 114, + 73, 110, 112, 117, 116, 13, + 10, 123, 13, 10, 9, 102, + 108, 111, 97, 116, 51, 32, + 112, 111, 115, 32, 32, 32, + 58, 32, 80, 79, 83, 73, + 84, 73, 79, 78, 59, 13, + 10, 9, 102, 108, 111, 97, + 116, 50, 32, 117, 118, 32, + 32, 32, 32, 58, 32, 84, + 69, 88, 67, 79, 79, 82, + 68, 48, 59, 13, 10, 9, + 102, 108, 111, 97, 116, 52, + 32, 99, 111, 108, 111, 114, + 32, 58, 32, 67, 79, 76, + 79, 82, 48, 59, 13, 10, + 125, 59, 13, 10, 13, 10, + 115, 116, 114, 117, 99, 116, + 32, 86, 101, 114, 116, 101, + 120, 83, 104, 97, 100, 101, + 114, 79, 117, 116, 112, 117, 116, 13, 10, 123, 13, 10, 9, 102, 108, 111, 97, 116, - 51, 32, 112, 111, 115, 32, - 32, 32, 58, 32, 80, 79, - 83, 73, 84, 73, 79, 78, - 59, 13, 10, 9, 102, 108, - 111, 97, 116, 50, 32, 117, - 118, 32, 32, 32, 32, 58, - 32, 84, 69, 88, 67, 79, - 79, 82, 68, 48, 59, 13, - 10, 9, 102, 108, 111, 97, - 116, 52, 32, 99, 111, 108, - 111, 114, 32, 58, 32, 67, - 79, 76, 79, 82, 48, 59, - 13, 10, 125, 59, 13, 10, - 13, 10, 115, 116, 114, 117, - 99, 116, 32, 86, 101, 114, - 116, 101, 120, 83, 104, 97, - 100, 101, 114, 79, 117, 116, - 112, 117, 116, 13, 10, 123, - 13, 10, 9, 102, 108, 111, - 97, 116, 52, 32, 112, 111, - 115, 32, 32, 32, 58, 32, - 83, 86, 95, 80, 79, 83, - 73, 84, 73, 79, 78, 59, - 13, 10, 9, 102, 108, 111, - 97, 116, 50, 32, 117, 118, - 32, 32, 32, 32, 58, 32, - 84, 69, 88, 67, 79, 79, - 82, 68, 48, 59, 13, 10, + 52, 32, 112, 111, 115, 32, + 32, 32, 58, 32, 83, 86, + 95, 80, 79, 83, 73, 84, + 73, 79, 78, 59, 13, 10, 9, 102, 108, 111, 97, 116, - 52, 32, 99, 111, 108, 111, - 114, 32, 58, 32, 67, 79, - 76, 79, 82, 48, 59, 13, - 10, 125, 59, 13, 10, 13, - 10, 86, 101, 114, 116, 101, - 120, 83, 27, 226, 48, 1, - 128, 0, 0, 0, 186, 4, - 241, 219, 110, 116, 215, 1, + 50, 32, 117, 118, 32, 32, + 32, 32, 58, 32, 84, 69, + 88, 67, 79, 79, 82, 68, + 48, 59, 13, 10, 9, 102, + 108, 111, 97, 116, 52, 32, + 99, 111, 108, 111, 114, 32, + 58, 32, 67, 79, 76, 79, + 82, 48, 59, 13, 10, 125, + 59, 13, 10, 13, 10, 86, + 101, 114, 116, 101, 120, 83, + 104, 97, 100, 101, 114, 79, + 117, 116, 112, 117, 116, 32, + 109, 97, 105, 110, 40, 86, + 101, 114, 27, 226, 48, 1, + 128, 0, 0, 0, 167, 168, + 26, 137, 194, 123, 215, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1243,12 +1243,12 @@ const BYTE shader_d3d11_vertex[] = 1, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, - 0, 0, 85, 0, 0, 0, + 0, 0, 75, 0, 0, 0, 40, 0, 0, 0, 27, 226, 48, 1, 98, 153, 244, 118, 113, 2, 0, 0, 1, 0, - 0, 0, 84, 0, 0, 0, - 85, 0, 0, 0, 0, 0, + 0, 0, 74, 0, 0, 0, + 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2259,7 +2259,7 @@ const BYTE shader_d3d11_vertex[] = 14, 0, 63, 92, 15, 0, 0, 0, 76, 0, 0, 0, 32, 0, 0, 0, 44, 0, - 0, 0, 96, 0, 0, 0, + 0, 0, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 25, 0, 0, 0, 0, 0, @@ -2267,20 +2267,20 @@ const BYTE shader_d3d11_vertex[] = 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 16, 2, 0, 0, 32, 0, - 0, 96, 0, 0, 70, 116, + 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 9, 0, 0, 5, 0, 0, 0, 0, 0, 0, 228, 1, 0, 0, - 1, 0, 0, 0, 144, 61, - 209, 2, 0, 0, 0, 0, + 1, 0, 0, 0, 136, 176, + 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 105, 110, 0, 110, 111, 110, 101, 0, 0, 0, 45, 186, 46, 241, 1, 0, 0, 0, 0, 0, 0, 0, 16, 2, 0, 0, 32, 0, 0, 96, - 0, 0, 70, 116, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 7, 0, 0, 0, 0, 0, 1, 0, @@ -2291,29 +2291,29 @@ const BYTE shader_d3d11_vertex[] = 0, 0, 0, 0, 255, 255, 255, 255, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 71, 58, 92, 118, + 0, 0, 71, 58, 92, 103, + 105, 116, 49, 92, 118, 105, + 100, 101, 111, 45, 114, 101, + 110, 100, 101, 114, 101, 114, + 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, 101, - 114, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 114, 99, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 104, 97, 100, 101, 114, - 92, 100, 51, 100, 49, 49, - 92, 100, 51, 100, 49, 49, - 95, 118, 101, 114, 116, 101, - 120, 46, 104, 108, 115, 108, - 0, 0, 254, 239, 254, 239, - 1, 0, 0, 0, 1, 0, - 0, 0, 0, 1, 0, 0, + 114, 92, 115, 104, 97, 100, + 101, 114, 92, 100, 51, 100, + 49, 49, 92, 100, 51, 100, + 49, 49, 95, 118, 101, 114, + 116, 101, 120, 46, 104, 108, + 115, 108, 0, 0, 0, 0, + 254, 239, 254, 239, 1, 0, + 0, 0, 1, 0, 0, 0, + 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 12, + 0, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, - 255, 255, 255, 255, 255, 255, - 255, 12, 0, 255, 255, 255, - 255, 255, 255, 255, 255, 255, - 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2339,11 +2339,11 @@ const BYTE shader_d3d11_vertex[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 46, - 49, 1, 71, 188, 231, 96, - 1, 0, 0, 0, 146, 145, - 161, 25, 166, 165, 97, 76, - 145, 91, 35, 95, 249, 79, - 70, 116, 128, 0, 0, 0, + 49, 1, 36, 7, 244, 96, + 1, 0, 0, 0, 237, 56, + 90, 236, 17, 212, 44, 78, + 150, 0, 153, 138, 205, 147, + 230, 247, 118, 0, 0, 0, 47, 76, 105, 110, 107, 73, 110, 102, 111, 0, 47, 110, 97, 109, 101, 115, 0, 47, @@ -2352,30 +2352,30 @@ const BYTE shader_d3d11_vertex[] = 111, 99, 107, 0, 47, 115, 114, 99, 47, 102, 105, 108, 101, 115, 47, 103, 58, 92, + 103, 105, 116, 49, 92, 118, + 105, 100, 101, 111, 45, 114, + 101, 110, 100, 101, 114, 101, + 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, - 101, 114, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 114, 99, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 104, 97, 100, 101, - 114, 92, 100, 51, 100, 49, - 49, 92, 100, 51, 100, 49, - 49, 95, 118, 101, 114, 116, - 101, 120, 46, 104, 108, 115, - 108, 0, 4, 0, 0, 0, - 6, 0, 0, 0, 1, 0, - 0, 0, 58, 0, 0, 0, - 0, 0, 0, 0, 17, 0, - 0, 0, 7, 0, 0, 0, - 10, 0, 0, 0, 6, 0, + 101, 114, 92, 115, 104, 97, + 100, 101, 114, 92, 100, 51, + 100, 49, 49, 92, 100, 51, + 100, 49, 49, 95, 118, 101, + 114, 116, 101, 120, 46, 104, + 108, 115, 108, 0, 4, 0, + 0, 0, 6, 0, 0, 0, + 1, 0, 0, 0, 58, 0, + 0, 0, 0, 0, 0, 0, + 17, 0, 0, 0, 7, 0, + 0, 0, 10, 0, 0, 0, + 6, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 34, 0, 0, 0, 8, 0, + 0, 0, 0, 0, 0, 0, + 220, 81, 51, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5, 0, 0, 0, 34, 0, - 0, 0, 8, 0, 0, 0, - 0, 0, 0, 0, 220, 81, - 51, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2425,10 +2425,10 @@ const BYTE shader_d3d11_vertex[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 32, 0, - 0, 0, 220, 0, 0, 0, - 156, 1, 0, 0, 103, 1, + 0, 0, 210, 0, 0, 0, + 156, 1, 0, 0, 95, 1, 0, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 74, 3, + 0, 0, 0, 0, 54, 3, 0, 0, 128, 0, 0, 0, 113, 2, 0, 0, 244, 6, 0, 0, 60, 0, 0, 0, diff --git a/src/video-renderer/shader/d3d11/shader_d3d11_yuv_bt601.h b/src/video-renderer/shader/d3d11/shader_d3d11_yuv_bt601.h index f2bc8a7..d209168 100644 --- a/src/video-renderer/shader/d3d11/shader_d3d11_yuv_bt601.h +++ b/src/video-renderer/shader/d3d11/shader_d3d11_yuv_bt601.h @@ -44,7 +44,7 @@ dcl_temps 6 // v2.x <- input.color.x; v2.y <- input.color.y; v2.z <- input.color.z; v2.w <- input.color.w; // o0.x <-
.x; o0.y <-
.y; o0.z <-
.z; o0.w <-
.w // -#line 18 "G:\video-renderer\video-renderer\src\video-renderer\shader\d3d11\d3d11_yuv_bt601.hlsl" +#line 18 "G:\git1\video-renderer\src\video-renderer\shader\d3d11\d3d11_yuv_bt601.hlsl" mov r0.xyz, l(-0.062745,-0.501961,-0.501961,0) // r0.x <- offset.x; r0.y <- offset.y; r0.z <- offset.z #line 19 @@ -94,10 +94,10 @@ ret const BYTE shader_d3d11_yuv_bt601[] = { - 68, 88, 66, 67, 35, 219, - 172, 45, 152, 236, 27, 67, - 200, 21, 55, 77, 253, 148, - 242, 243, 1, 0, 0, 0, + 68, 88, 66, 67, 6, 216, + 196, 88, 145, 220, 238, 143, + 136, 119, 128, 152, 79, 201, + 42, 78, 1, 0, 0, 0, 200, 66, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, 48, 1, 0, 0, 164, 1, @@ -725,11 +725,11 @@ const BYTE shader_d3d11_yuv_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 46, - 49, 1, 226, 197, 230, 96, - 1, 0, 0, 0, 18, 97, - 179, 118, 27, 243, 176, 78, - 191, 41, 70, 120, 16, 139, - 111, 164, 0, 0, 0, 0, + 49, 1, 36, 7, 244, 96, + 1, 0, 0, 0, 121, 187, + 59, 127, 169, 59, 60, 72, + 135, 90, 185, 108, 165, 240, + 141, 233, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -810,100 +810,100 @@ const BYTE shader_d3d11_yuv_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 116, 13, 10, 123, 13, 10, - 9, 102, 108, 111, 97, 116, - 52, 32, 112, 111, 115, 32, - 32, 32, 58, 32, 83, 86, - 95, 80, 79, 83, 73, 84, - 73, 79, 78, 59, 13, 10, - 9, 102, 108, 111, 97, 116, - 50, 32, 116, 101, 120, 32, - 32, 32, 58, 32, 84, 69, - 88, 67, 79, 79, 82, 68, - 48, 59, 13, 10, 9, 102, - 108, 111, 97, 116, 52, 32, - 99, 111, 108, 111, 114, 32, - 58, 32, 67, 79, 76, 79, - 82, 48, 59, 13, 10, 125, - 59, 13, 10, 102, 108, 111, - 97, 116, 52, 32, 109, 97, - 105, 110, 40, 80, 105, 120, - 101, 108, 83, 104, 97, 100, - 101, 114, 73, 110, 112, 117, - 116, 32, 105, 110, 112, 117, - 116, 41, 32, 58, 32, 83, - 86, 95, 84, 65, 82, 71, - 69, 84, 13, 10, 123, 13, - 10, 9, 99, 111, 110, 115, - 116, 32, 102, 108, 111, 97, - 116, 51, 32, 111, 102, 102, - 115, 101, 116, 32, 61, 32, - 123, 45, 48, 46, 48, 54, - 50, 55, 52, 53, 49, 48, - 49, 55, 44, 32, 45, 48, + 58, 32, 83, 86, 95, 80, + 79, 83, 73, 84, 73, 79, + 78, 59, 13, 10, 9, 102, + 108, 111, 97, 116, 50, 32, + 116, 101, 120, 32, 32, 32, + 58, 32, 84, 69, 88, 67, + 79, 79, 82, 68, 48, 59, + 13, 10, 9, 102, 108, 111, + 97, 116, 52, 32, 99, 111, + 108, 111, 114, 32, 58, 32, + 67, 79, 76, 79, 82, 48, + 59, 13, 10, 125, 59, 13, + 10, 102, 108, 111, 97, 116, + 52, 32, 109, 97, 105, 110, + 40, 80, 105, 120, 101, 108, + 83, 104, 97, 100, 101, 114, + 73, 110, 112, 117, 116, 32, + 105, 110, 112, 117, 116, 41, + 32, 58, 32, 83, 86, 95, + 84, 65, 82, 71, 69, 84, + 13, 10, 123, 13, 10, 9, + 99, 111, 110, 115, 116, 32, + 102, 108, 111, 97, 116, 51, + 32, 111, 102, 102, 115, 101, + 116, 32, 61, 32, 123, 45, + 48, 46, 48, 54, 50, 55, + 52, 53, 49, 48, 49, 55, + 44, 32, 45, 48, 46, 53, + 48, 49, 57, 54, 48, 56, + 49, 52, 44, 32, 45, 48, 46, 53, 48, 49, 57, 54, - 48, 56, 49, 52, 44, 32, - 45, 48, 46, 53, 48, 49, - 57, 54, 48, 56, 49, 52, - 125, 59, 13, 10, 9, 99, - 111, 110, 115, 116, 32, 102, - 108, 111, 97, 116, 51, 32, - 82, 99, 111, 101, 102, 102, - 32, 61, 32, 123, 49, 46, - 49, 54, 52, 52, 44, 32, - 32, 48, 46, 48, 48, 48, - 48, 44, 32, 32, 49, 46, - 53, 57, 54, 48, 125, 59, + 48, 56, 49, 52, 125, 59, 13, 10, 9, 99, 111, 110, 115, 116, 32, 102, 108, 111, - 97, 116, 51, 32, 71, 99, + 97, 116, 51, 32, 82, 99, 111, 101, 102, 102, 32, 61, 32, 123, 49, 46, 49, 54, - 52, 52, 44, 32, 45, 48, - 46, 51, 57, 49, 56, 44, - 32, 45, 48, 46, 56, 49, - 51, 48, 125, 59, 13, 10, + 52, 52, 44, 32, 32, 48, + 46, 48, 48, 48, 48, 44, + 32, 32, 49, 46, 53, 57, + 54, 48, 125, 59, 13, 10, 9, 99, 111, 110, 115, 116, 32, 102, 108, 111, 97, 116, - 51, 32, 66, 99, 111, 101, + 51, 32, 71, 99, 111, 101, 102, 102, 32, 61, 32, 123, 49, 46, 49, 54, 52, 52, - 44, 32, 32, 50, 46, 48, - 49, 55, 50, 44, 32, 32, - 48, 46, 48, 48, 48, 48, - 125, 59, 13, 10, 13, 10, - 9, 102, 108, 111, 97, 116, - 52, 32, 79, 117, 116, 112, - 117, 116, 59, 13, 10, 13, - 10, 9, 102, 108, 111, 97, - 116, 51, 32, 121, 117, 118, + 44, 32, 45, 48, 46, 51, + 57, 49, 56, 44, 32, 45, + 48, 46, 56, 49, 51, 48, + 125, 59, 13, 10, 9, 99, + 111, 110, 115, 116, 32, 102, + 108, 111, 97, 116, 51, 32, + 66, 99, 111, 101, 102, 102, + 32, 61, 32, 123, 49, 46, + 49, 54, 52, 52, 44, 32, + 32, 50, 46, 48, 49, 55, + 50, 44, 32, 32, 48, 46, + 48, 48, 48, 48, 125, 59, + 13, 10, 13, 10, 9, 102, + 108, 111, 97, 116, 52, 32, + 79, 117, 116, 112, 117, 116, + 59, 13, 10, 13, 10, 9, + 102, 108, 111, 97, 116, 51, + 32, 121, 117, 118, 59, 13, + 10, 9, 121, 117, 118, 46, + 120, 32, 61, 32, 89, 84, + 101, 120, 116, 117, 114, 101, + 46, 83, 97, 109, 112, 108, + 101, 40, 76, 105, 110, 101, + 97, 114, 83, 97, 109, 112, + 108, 101, 114, 44, 32, 105, + 110, 112, 117, 116, 46, 116, + 101, 120, 41, 46, 114, 59, + 13, 10, 9, 121, 117, 118, + 46, 121, 32, 61, 32, 85, + 84, 101, 120, 116, 117, 114, + 101, 46, 83, 97, 109, 112, + 108, 101, 40, 76, 105, 110, + 101, 97, 114, 83, 97, 109, + 112, 108, 101, 114, 44, 32, + 105, 110, 112, 117, 116, 46, + 116, 101, 120, 41, 46, 114, 59, 13, 10, 9, 121, 117, - 118, 46, 120, 32, 61, 32, - 89, 84, 101, 120, 116, 117, - 114, 101, 46, 83, 97, 109, - 112, 108, 101, 40, 76, 105, - 110, 101, 97, 114, 83, 97, - 109, 112, 108, 101, 114, 44, - 32, 105, 110, 112, 117, 116, - 46, 116, 101, 120, 41, 46, - 114, 59, 13, 10, 9, 121, - 117, 118, 46, 121, 32, 61, - 32, 85, 84, 101, 120, 116, - 117, 114, 101, 46, 83, 97, - 109, 112, 108, 101, 40, 76, - 105, 110, 101, 97, 114, 83, - 97, 109, 112, 108, 101, 114, - 44, 32, 105, 110, 112, 117, - 116, 46, 116, 101, 120, 41, - 46, 114, 198, 90, 0, 0, + 118, 46, 122, 32, 61, 32, + 86, 84, 101, 120, 116, 117, + 114, 101, 198, 90, 0, 0, 117, 131, 1, 0, 24, 184, 3, 0, 47, 63, 0, 0, 38, 247, 2, 0, 65, 36, 1, 0, 39, 82, 3, 0, 76, 232, 3, 0, 217, 42, - 2, 0, 82, 194, 3, 0, + 2, 0, 240, 37, 2, 0, 206, 55, 0, 0, 57, 206, - 1, 0, 16, 77, 2, 0, + 1, 0, 122, 76, 0, 0, 90, 28, 0, 0, 177, 197, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1238,93 +1238,93 @@ const BYTE shader_d3d11_yuv_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 239, 254, 239, 1, 0, 0, 0, - 198, 4, 0, 0, 0, 71, - 58, 92, 118, 105, 100, 101, + 178, 4, 0, 0, 0, 71, + 58, 92, 103, 105, 116, 49, + 92, 118, 105, 100, 101, 111, + 45, 114, 101, 110, 100, 101, + 114, 101, 114, 92, 115, 114, + 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 114, 99, 92, + 101, 114, 101, 114, 92, 115, + 104, 97, 100, 101, 114, 92, + 100, 51, 100, 49, 49, 92, + 100, 51, 100, 49, 49, 95, + 121, 117, 118, 95, 98, 116, + 54, 48, 49, 46, 104, 108, + 115, 108, 0, 0, 103, 58, + 92, 103, 105, 116, 49, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, - 101, 114, 92, 115, 104, 97, - 100, 101, 114, 92, 100, 51, - 100, 49, 49, 92, 100, 51, - 100, 49, 49, 95, 121, 117, - 118, 95, 98, 116, 54, 48, - 49, 46, 104, 108, 115, 108, - 0, 0, 103, 58, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 114, 99, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 104, 97, 100, 101, 114, - 92, 100, 51, 100, 49, 49, - 92, 100, 51, 100, 49, 49, - 95, 121, 117, 118, 95, 98, - 116, 54, 48, 49, 46, 104, - 108, 115, 108, 0, 47, 47, - 32, 83, 68, 76, 32, 115, - 104, 97, 100, 101, 114, 44, - 32, 104, 116, 116, 112, 115, - 58, 47, 47, 103, 105, 116, - 104, 117, 98, 46, 99, 111, - 109, 47, 108, 105, 98, 115, - 100, 108, 45, 111, 114, 103, - 47, 83, 68, 76, 47, 98, - 108, 111, 98, 47, 109, 97, - 105, 110, 47, 115, 114, 99, - 47, 114, 101, 110, 100, 101, - 114, 47, 100, 105, 114, 101, - 99, 116, 51, 100, 49, 49, - 47, 83, 68, 76, 95, 115, - 104, 97, 100, 101, 114, 115, - 95, 100, 51, 100, 49, 49, - 46, 99, 13, 10, 13, 10, - 84, 101, 120, 116, 117, 114, - 101, 50, 68, 32, 89, 84, - 101, 120, 116, 117, 114, 101, - 32, 58, 32, 114, 101, 103, - 105, 115, 116, 101, 114, 40, - 116, 48, 41, 59, 13, 10, - 84, 101, 120, 116, 117, 114, - 101, 50, 68, 32, 85, 84, - 101, 120, 116, 117, 114, 101, - 32, 58, 32, 114, 101, 103, - 105, 115, 116, 101, 114, 40, - 116, 49, 41, 59, 13, 10, - 84, 101, 120, 116, 117, 114, - 101, 50, 68, 32, 86, 84, - 101, 120, 116, 117, 114, 101, - 32, 58, 32, 114, 101, 103, - 105, 115, 116, 101, 114, 40, - 116, 50, 41, 59, 13, 10, + 101, 114, 92, 115, 114, 99, + 92, 118, 105, 100, 101, 111, + 45, 114, 101, 110, 100, 101, + 114, 101, 114, 92, 115, 104, + 97, 100, 101, 114, 92, 100, + 51, 100, 49, 49, 92, 100, + 51, 100, 49, 49, 95, 121, + 117, 118, 95, 98, 116, 54, + 48, 49, 46, 104, 108, 115, + 108, 0, 47, 47, 32, 83, + 68, 76, 32, 115, 104, 97, + 100, 101, 114, 44, 32, 104, + 116, 116, 112, 115, 58, 47, + 47, 103, 105, 116, 104, 117, + 98, 46, 99, 111, 109, 47, + 108, 105, 98, 115, 100, 108, + 45, 111, 114, 103, 47, 83, + 68, 76, 47, 98, 108, 111, + 98, 47, 109, 97, 105, 110, + 47, 115, 114, 99, 47, 114, + 101, 110, 100, 101, 114, 47, + 100, 105, 114, 101, 99, 116, + 51, 100, 49, 49, 47, 83, + 68, 76, 95, 115, 104, 97, + 100, 101, 114, 115, 95, 100, + 51, 100, 49, 49, 46, 99, + 13, 10, 13, 10, 84, 101, + 120, 116, 117, 114, 101, 50, + 68, 32, 89, 84, 101, 120, + 116, 117, 114, 101, 32, 58, + 32, 114, 101, 103, 105, 115, + 116, 101, 114, 40, 116, 48, + 41, 59, 13, 10, 84, 101, + 120, 116, 117, 114, 101, 50, + 68, 32, 85, 84, 101, 120, + 116, 117, 114, 101, 32, 58, + 32, 114, 101, 103, 105, 115, + 116, 101, 114, 40, 116, 49, + 41, 59, 13, 10, 84, 101, + 120, 116, 117, 114, 101, 50, + 68, 32, 86, 84, 101, 120, + 116, 117, 114, 101, 32, 58, + 32, 114, 101, 103, 105, 115, + 116, 101, 114, 40, 116, 50, + 41, 59, 13, 10, 13, 10, + 83, 97, 109, 112, 108, 101, + 114, 83, 116, 97, 116, 101, + 32, 76, 105, 110, 101, 97, + 114, 83, 97, 109, 112, 108, + 101, 114, 32, 58, 32, 114, + 101, 103, 105, 115, 116, 101, + 114, 40, 115, 48, 41, 59, 13, 10, 83, 97, 109, 112, 108, 101, 114, 83, 116, 97, - 116, 101, 32, 76, 105, 110, - 101, 97, 114, 83, 97, 109, - 112, 108, 101, 114, 32, 58, + 116, 101, 32, 80, 111, 105, + 110, 116, 83, 97, 109, 112, + 108, 101, 114, 32, 32, 58, 32, 114, 101, 103, 105, 115, - 116, 101, 114, 40, 115, 48, - 41, 59, 13, 10, 83, 97, - 109, 112, 108, 101, 114, 83, - 116, 97, 116, 101, 32, 80, - 111, 105, 110, 116, 83, 97, - 109, 112, 108, 101, 114, 32, - 32, 58, 32, 114, 101, 103, - 105, 115, 116, 101, 114, 40, - 115, 49, 41, 59, 13, 10, - 13, 10, 115, 116, 114, 117, - 99, 116, 32, 80, 105, 120, - 101, 108, 83, 104, 97, 100, - 101, 114, 73, 110, 112, 117, + 116, 101, 114, 40, 115, 49, + 41, 59, 13, 10, 13, 10, + 115, 116, 114, 117, 99, 116, + 32, 80, 105, 120, 101, 108, + 83, 104, 97, 100, 101, 114, + 73, 110, 112, 117, 116, 13, + 10, 123, 13, 10, 9, 102, + 108, 111, 97, 116, 52, 32, + 112, 111, 115, 32, 32, 32, 27, 226, 48, 1, 128, 0, - 0, 0, 239, 68, 239, 254, - 219, 115, 215, 1, 1, 0, + 0, 0, 109, 120, 88, 137, + 194, 123, 215, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1336,11 +1336,11 @@ const BYTE shader_d3d11_yuv_bt601[] = 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 88, 0, 0, 0, 40, 0, + 78, 0, 0, 0, 40, 0, 0, 0, 27, 226, 48, 1, 250, 131, 158, 165, 23, 4, 0, 0, 1, 0, 0, 0, - 87, 0, 0, 0, 88, 0, + 77, 0, 0, 0, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1795,14 +1795,14 @@ const BYTE shader_d3d11_yuv_bt601[] = 10, 0, 24, 21, 7, 16, 0, 0, 1, 0, 1, 0, 14, 0, 23, 21, 0, 16, - 0, 0, 3, 2, 0, 3, + 0, 0, 3, 2, 80, 0, 0, 0, 242, 241, 10, 0, 24, 21, 9, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, 10, 16, 0, 0, 1, 0, 0, 2, 14, 0, 23, 21, 0, 0, 0, 0, - 10, 2, 0, 3, 0, 0, + 10, 2, 80, 0, 0, 0, 242, 241, 10, 0, 24, 21, 12, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, @@ -1919,47 +1919,47 @@ const BYTE shader_d3d11_yuv_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 59, 13, 10, 9, - 121, 117, 118, 46, 122, 32, - 61, 32, 86, 84, 101, 120, - 116, 117, 114, 101, 46, 83, - 97, 109, 112, 108, 101, 40, - 76, 105, 110, 101, 97, 114, - 83, 97, 109, 112, 108, 101, - 114, 44, 32, 105, 110, 112, - 117, 116, 46, 116, 101, 120, - 41, 46, 114, 59, 13, 10, - 13, 10, 9, 121, 117, 118, - 32, 43, 61, 32, 111, 102, - 102, 115, 101, 116, 59, 13, + 0, 0, 46, 83, 97, 109, + 112, 108, 101, 40, 76, 105, + 110, 101, 97, 114, 83, 97, + 109, 112, 108, 101, 114, 44, + 32, 105, 110, 112, 117, 116, + 46, 116, 101, 120, 41, 46, + 114, 59, 13, 10, 13, 10, + 9, 121, 117, 118, 32, 43, + 61, 32, 111, 102, 102, 115, + 101, 116, 59, 13, 10, 9, + 79, 117, 116, 112, 117, 116, + 46, 114, 32, 61, 32, 100, + 111, 116, 40, 121, 117, 118, + 44, 32, 82, 99, 111, 101, + 102, 102, 41, 59, 13, 10, + 9, 79, 117, 116, 112, 117, + 116, 46, 103, 32, 61, 32, + 100, 111, 116, 40, 121, 117, + 118, 44, 32, 71, 99, 111, + 101, 102, 102, 41, 59, 13, 10, 9, 79, 117, 116, 112, - 117, 116, 46, 114, 32, 61, + 117, 116, 46, 98, 32, 61, 32, 100, 111, 116, 40, 121, - 117, 118, 44, 32, 82, 99, + 117, 118, 44, 32, 66, 99, 111, 101, 102, 102, 41, 59, 13, 10, 9, 79, 117, 116, - 112, 117, 116, 46, 103, 32, - 61, 32, 100, 111, 116, 40, - 121, 117, 118, 44, 32, 71, - 99, 111, 101, 102, 102, 41, - 59, 13, 10, 9, 79, 117, - 116, 112, 117, 116, 46, 98, - 32, 61, 32, 100, 111, 116, - 40, 121, 117, 118, 44, 32, - 66, 99, 111, 101, 102, 102, - 41, 59, 13, 10, 9, 79, - 117, 116, 112, 117, 116, 46, - 97, 32, 61, 32, 49, 46, - 48, 102, 59, 13, 10, 13, - 10, 9, 114, 101, 116, 117, - 114, 110, 32, 79, 117, 116, - 112, 117, 116, 59, 13, 10, - 125, 0, 7, 0, 0, 0, - 0, 0, 0, 0, 87, 0, - 0, 0, 1, 0, 0, 0, - 88, 0, 0, 0, 0, 0, + 112, 117, 116, 46, 97, 32, + 61, 32, 49, 46, 48, 102, + 59, 13, 10, 13, 10, 9, + 114, 101, 116, 117, 114, 110, + 32, 79, 117, 116, 112, 117, + 116, 59, 13, 10, 125, 0, + 7, 0, 0, 0, 0, 0, + 0, 0, 77, 0, 0, 0, + 1, 0, 0, 0, 78, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 154, 0, + 0, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 174, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2437,7 +2437,7 @@ const BYTE shader_d3d11_yuv_bt601[] = 14, 0, 63, 92, 15, 0, 0, 0, 76, 0, 0, 0, 32, 0, 0, 0, 44, 0, - 0, 0, 100, 0, 0, 0, + 0, 0, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 25, 0, 0, 0, 0, 0, @@ -2445,20 +2445,20 @@ const BYTE shader_d3d11_yuv_bt601[] = 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 100, 2, 0, 0, 32, 0, - 0, 96, 0, 0, 111, 164, + 0, 96, 0, 0, 141, 233, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 9, 0, 152, 5, 0, 0, 0, 0, 0, 0, 44, 2, 0, 0, - 1, 0, 0, 0, 128, 156, - 31, 3, 0, 0, 0, 0, + 1, 0, 0, 0, 88, 176, + 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 105, 110, 0, 110, 111, 110, 101, 0, 0, 0, 45, 186, 46, 241, 1, 0, 0, 0, 0, 0, 0, 0, 100, 2, 0, 0, 32, 0, 0, 96, - 0, 0, 111, 164, 0, 0, + 0, 0, 141, 233, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 7, 0, 0, 0, 0, 0, 1, 0, @@ -2469,21 +2469,19 @@ const BYTE shader_d3d11_yuv_bt601[] = 0, 0, 0, 0, 255, 255, 255, 255, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 71, 58, 92, 118, + 0, 0, 71, 58, 92, 103, + 105, 116, 49, 92, 118, 105, + 100, 101, 111, 45, 114, 101, + 110, 100, 101, 114, 101, 114, + 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, 101, - 114, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 114, 99, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 104, 97, 100, 101, 114, - 92, 100, 51, 100, 49, 49, - 92, 100, 51, 100, 49, 49, - 95, 121, 117, 118, 95, 98, - 116, 54, 48, 49, 46, 104, - 108, 115, 108, 0, 0, 0, + 114, 92, 115, 104, 97, 100, + 101, 114, 92, 100, 51, 100, + 49, 49, 92, 100, 51, 100, + 49, 49, 95, 121, 117, 118, + 95, 98, 116, 54, 48, 49, + 46, 104, 108, 115, 108, 0, 254, 239, 254, 239, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, @@ -2516,12 +2514,14 @@ const BYTE shader_d3d11_yuv_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 46, - 49, 1, 226, 197, 230, 96, - 1, 0, 0, 0, 18, 97, - 179, 118, 27, 243, 176, 78, - 191, 41, 70, 120, 16, 139, - 111, 164, 131, 0, 0, 0, + 49, 1, 36, 7, 244, 96, + 1, 0, 0, 0, 121, 187, + 59, 127, 169, 59, 60, 72, + 135, 90, 185, 108, 165, 240, + 141, 233, 121, 0, 0, 0, 47, 76, 105, 110, 107, 73, 110, 102, 111, 0, 47, 110, 97, 109, 101, 115, 0, 47, @@ -2530,30 +2530,30 @@ const BYTE shader_d3d11_yuv_bt601[] = 111, 99, 107, 0, 47, 115, 114, 99, 47, 102, 105, 108, 101, 115, 47, 103, 58, 92, + 103, 105, 116, 49, 92, 118, + 105, 100, 101, 111, 45, 114, + 101, 110, 100, 101, 114, 101, + 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, - 101, 114, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 114, 99, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 104, 97, 100, 101, - 114, 92, 100, 51, 100, 49, - 49, 92, 100, 51, 100, 49, - 49, 95, 121, 117, 118, 95, - 98, 116, 54, 48, 49, 46, - 104, 108, 115, 108, 0, 4, + 101, 114, 92, 115, 104, 97, + 100, 101, 114, 92, 100, 51, + 100, 49, 49, 92, 100, 51, + 100, 49, 49, 95, 121, 117, + 118, 95, 98, 116, 54, 48, + 49, 46, 104, 108, 115, 108, + 0, 4, 0, 0, 0, 6, + 0, 0, 0, 1, 0, 0, + 0, 58, 0, 0, 0, 0, + 0, 0, 0, 17, 0, 0, + 0, 7, 0, 0, 0, 10, 0, 0, 0, 6, 0, 0, - 0, 1, 0, 0, 0, 58, - 0, 0, 0, 0, 0, 0, - 0, 17, 0, 0, 0, 7, - 0, 0, 0, 10, 0, 0, - 0, 6, 0, 0, 0, 0, - 0, 0, 0, 5, 0, 0, - 0, 34, 0, 0, 0, 8, + 0, 0, 0, 0, 0, 5, + 0, 0, 0, 34, 0, 0, + 0, 8, 0, 0, 0, 0, + 0, 0, 0, 220, 81, 51, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 220, 81, 51, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2603,10 +2603,10 @@ const BYTE shader_d3d11_yuv_bt601[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 32, 0, - 0, 0, 223, 0, 0, 0, - 96, 1, 0, 0, 107, 1, + 0, 0, 213, 0, 0, 0, + 96, 1, 0, 0, 95, 1, 0, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 246, 4, + 0, 0, 0, 0, 226, 4, 0, 0, 128, 0, 0, 0, 23, 4, 0, 0, 220, 7, 0, 0, 68, 0, 0, 0, diff --git a/src/video-renderer/shader/d3d11/shader_d3d11_yuv_bt709.h b/src/video-renderer/shader/d3d11/shader_d3d11_yuv_bt709.h index 4bac06f..9f8947f 100644 --- a/src/video-renderer/shader/d3d11/shader_d3d11_yuv_bt709.h +++ b/src/video-renderer/shader/d3d11/shader_d3d11_yuv_bt709.h @@ -44,7 +44,7 @@ dcl_temps 6 // v2.x <- input.color.x; v2.y <- input.color.y; v2.z <- input.color.z; v2.w <- input.color.w; // o0.x <-
.x; o0.y <-
.y; o0.z <-
.z; o0.w <-
.w // -#line 19 "G:\video-renderer\video-renderer\src\video-renderer\shader\d3d11\d3d11_yuv_bt709.hlsl" +#line 19 "G:\git1\video-renderer\src\video-renderer\shader\d3d11\d3d11_yuv_bt709.hlsl" mov r0.xyz, l(-0.062745,-0.501961,-0.501961,0) // r0.x <- offset.x; r0.y <- offset.y; r0.z <- offset.z #line 20 @@ -94,10 +94,10 @@ ret const BYTE shader_d3d11_yuv_bt709[] = { - 68, 88, 66, 67, 183, 120, - 62, 220, 17, 191, 36, 180, - 0, 193, 137, 154, 15, 33, - 83, 59, 1, 0, 0, 0, + 68, 88, 66, 67, 31, 123, + 181, 73, 136, 51, 219, 66, + 111, 91, 124, 245, 83, 228, + 2, 175, 1, 0, 0, 0, 200, 66, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, 48, 1, 0, 0, 164, 1, @@ -725,11 +725,11 @@ const BYTE shader_d3d11_yuv_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 46, - 49, 1, 226, 197, 230, 96, - 1, 0, 0, 0, 232, 217, - 109, 74, 19, 90, 55, 75, - 145, 177, 73, 48, 236, 24, - 210, 152, 0, 0, 0, 0, + 49, 1, 37, 7, 244, 96, + 1, 0, 0, 0, 200, 118, + 246, 151, 75, 199, 102, 75, + 152, 107, 9, 86, 139, 165, + 190, 93, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -810,100 +810,100 @@ const BYTE shader_d3d11_yuv_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 73, 84, 73, 79, 78, 59, + 10, 32, 32, 32, 32, 102, + 108, 111, 97, 116, 50, 32, + 116, 101, 120, 32, 32, 32, + 58, 32, 84, 69, 88, 67, + 79, 79, 82, 68, 48, 59, + 10, 32, 32, 32, 32, 102, 108, 111, 97, 116, 52, 32, - 112, 111, 115, 32, 32, 32, - 58, 32, 83, 86, 95, 80, - 79, 83, 73, 84, 73, 79, - 78, 59, 10, 32, 32, 32, - 32, 102, 108, 111, 97, 116, - 50, 32, 116, 101, 120, 32, - 32, 32, 58, 32, 84, 69, - 88, 67, 79, 79, 82, 68, - 48, 59, 10, 32, 32, 32, - 32, 102, 108, 111, 97, 116, - 52, 32, 99, 111, 108, 111, - 114, 32, 58, 32, 67, 79, - 76, 79, 82, 48, 59, 10, - 125, 59, 10, 10, 102, 108, - 111, 97, 116, 52, 32, 109, - 97, 105, 110, 40, 80, 105, - 120, 101, 108, 83, 104, 97, - 100, 101, 114, 73, 110, 112, - 117, 116, 32, 105, 110, 112, - 117, 116, 41, 32, 58, 32, - 83, 86, 95, 84, 65, 82, - 71, 69, 84, 10, 123, 10, - 32, 32, 32, 32, 99, 111, - 110, 115, 116, 32, 102, 108, - 111, 97, 116, 51, 32, 111, - 102, 102, 115, 101, 116, 32, - 61, 32, 123, 45, 48, 46, - 48, 54, 50, 55, 52, 53, - 49, 48, 49, 55, 44, 32, + 99, 111, 108, 111, 114, 32, + 58, 32, 67, 79, 76, 79, + 82, 48, 59, 10, 125, 59, + 10, 10, 102, 108, 111, 97, + 116, 52, 32, 109, 97, 105, + 110, 40, 80, 105, 120, 101, + 108, 83, 104, 97, 100, 101, + 114, 73, 110, 112, 117, 116, + 32, 105, 110, 112, 117, 116, + 41, 32, 58, 32, 83, 86, + 95, 84, 65, 82, 71, 69, + 84, 10, 123, 10, 32, 32, + 32, 32, 99, 111, 110, 115, + 116, 32, 102, 108, 111, 97, + 116, 51, 32, 111, 102, 102, + 115, 101, 116, 32, 61, 32, + 123, 45, 48, 46, 48, 54, + 50, 55, 52, 53, 49, 48, + 49, 55, 44, 32, 45, 48, + 46, 53, 48, 49, 57, 54, + 48, 56, 49, 52, 44, 32, 45, 48, 46, 53, 48, 49, 57, 54, 48, 56, 49, 52, - 44, 32, 45, 48, 46, 53, - 48, 49, 57, 54, 48, 56, - 49, 52, 125, 59, 10, 32, - 32, 32, 32, 99, 111, 110, - 115, 116, 32, 102, 108, 111, - 97, 116, 51, 32, 82, 99, - 111, 101, 102, 102, 32, 61, - 32, 123, 49, 46, 49, 54, - 52, 52, 44, 32, 32, 48, - 46, 48, 48, 48, 48, 44, - 32, 32, 49, 46, 55, 57, - 50, 55, 125, 59, 10, 32, - 32, 32, 32, 99, 111, 110, - 115, 116, 32, 102, 108, 111, - 97, 116, 51, 32, 71, 99, - 111, 101, 102, 102, 32, 61, - 32, 123, 49, 46, 49, 54, - 52, 52, 44, 32, 45, 48, - 46, 50, 49, 51, 50, 44, - 32, 45, 48, 46, 53, 51, - 50, 57, 125, 59, 10, 32, - 32, 32, 32, 99, 111, 110, - 115, 116, 32, 102, 108, 111, - 97, 116, 51, 32, 66, 99, - 111, 101, 102, 102, 32, 61, - 32, 123, 49, 46, 49, 54, - 52, 52, 44, 32, 32, 50, - 46, 49, 49, 50, 52, 44, - 32, 32, 48, 46, 48, 48, - 48, 48, 125, 59, 10, 10, + 125, 59, 10, 32, 32, 32, + 32, 99, 111, 110, 115, 116, + 32, 102, 108, 111, 97, 116, + 51, 32, 82, 99, 111, 101, + 102, 102, 32, 61, 32, 123, + 49, 46, 49, 54, 52, 52, + 44, 32, 32, 48, 46, 48, + 48, 48, 48, 44, 32, 32, + 49, 46, 55, 57, 50, 55, + 125, 59, 10, 32, 32, 32, + 32, 99, 111, 110, 115, 116, + 32, 102, 108, 111, 97, 116, + 51, 32, 71, 99, 111, 101, + 102, 102, 32, 61, 32, 123, + 49, 46, 49, 54, 52, 52, + 44, 32, 45, 48, 46, 50, + 49, 51, 50, 44, 32, 45, + 48, 46, 53, 51, 50, 57, + 125, 59, 10, 32, 32, 32, + 32, 99, 111, 110, 115, 116, + 32, 102, 108, 111, 97, 116, + 51, 32, 66, 99, 111, 101, + 102, 102, 32, 61, 32, 123, + 49, 46, 49, 54, 52, 52, + 44, 32, 32, 50, 46, 49, + 49, 50, 52, 44, 32, 32, + 48, 46, 48, 48, 48, 48, + 125, 59, 10, 10, 32, 32, + 32, 32, 102, 108, 111, 97, + 116, 52, 32, 79, 117, 116, + 112, 117, 116, 59, 10, 10, 32, 32, 32, 32, 102, 108, - 111, 97, 116, 52, 32, 79, - 117, 116, 112, 117, 116, 59, - 10, 10, 32, 32, 32, 32, - 102, 108, 111, 97, 116, 51, - 32, 121, 117, 118, 59, 10, - 32, 32, 32, 32, 121, 117, - 118, 46, 120, 32, 61, 32, - 89, 84, 101, 120, 116, 117, - 114, 101, 46, 83, 97, 109, - 112, 108, 101, 40, 76, 105, - 110, 101, 97, 114, 83, 97, - 109, 112, 108, 101, 114, 44, - 32, 105, 110, 112, 117, 116, - 46, 116, 101, 120, 41, 46, - 114, 59, 10, 32, 32, 32, - 32, 121, 117, 118, 46, 121, - 32, 61, 32, 85, 84, 101, - 120, 116, 117, 114, 101, 46, - 83, 97, 109, 112, 108, 101, - 40, 76, 105, 110, 101, 97, - 114, 83, 97, 109, 112, 108, - 101, 114, 44, 32, 105, 110, - 112, 117, 198, 90, 0, 0, + 111, 97, 116, 51, 32, 121, + 117, 118, 59, 10, 32, 32, + 32, 32, 121, 117, 118, 46, + 120, 32, 61, 32, 89, 84, + 101, 120, 116, 117, 114, 101, + 46, 83, 97, 109, 112, 108, + 101, 40, 76, 105, 110, 101, + 97, 114, 83, 97, 109, 112, + 108, 101, 114, 44, 32, 105, + 110, 112, 117, 116, 46, 116, + 101, 120, 41, 46, 114, 59, + 10, 32, 32, 32, 32, 121, + 117, 118, 46, 121, 32, 61, + 32, 85, 84, 101, 120, 116, + 117, 114, 101, 46, 83, 97, + 109, 112, 108, 101, 40, 76, + 105, 110, 101, 97, 114, 83, + 97, 109, 112, 108, 101, 114, + 44, 32, 105, 110, 112, 117, + 116, 46, 116, 101, 120, 41, + 46, 114, 59, 10, 32, 32, + 32, 32, 121, 117, 118, 46, + 122, 32, 198, 90, 0, 0, 117, 131, 1, 0, 24, 184, 3, 0, 47, 63, 0, 0, 38, 247, 2, 0, 65, 36, 1, 0, 39, 82, 3, 0, 76, 232, 3, 0, 217, 42, - 2, 0, 189, 191, 1, 0, + 2, 0, 9, 41, 0, 0, 206, 55, 0, 0, 57, 206, - 1, 0, 191, 77, 0, 0, + 1, 0, 130, 67, 2, 0, 90, 28, 0, 0, 177, 197, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1238,93 +1238,93 @@ const BYTE shader_d3d11_yuv_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 239, 254, 239, 1, 0, 0, 0, - 217, 4, 0, 0, 0, 71, - 58, 92, 118, 105, 100, 101, + 197, 4, 0, 0, 0, 71, + 58, 92, 103, 105, 116, 49, + 92, 118, 105, 100, 101, 111, + 45, 114, 101, 110, 100, 101, + 114, 101, 114, 92, 115, 114, + 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 114, 99, 92, + 101, 114, 101, 114, 92, 115, + 104, 97, 100, 101, 114, 92, + 100, 51, 100, 49, 49, 92, + 100, 51, 100, 49, 49, 95, + 121, 117, 118, 95, 98, 116, + 55, 48, 57, 46, 104, 108, + 115, 108, 0, 0, 103, 58, + 92, 103, 105, 116, 49, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, - 101, 114, 92, 115, 104, 97, - 100, 101, 114, 92, 100, 51, - 100, 49, 49, 92, 100, 51, - 100, 49, 49, 95, 121, 117, - 118, 95, 98, 116, 55, 48, - 57, 46, 104, 108, 115, 108, - 0, 0, 103, 58, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 114, 99, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 104, 97, 100, 101, 114, - 92, 100, 51, 100, 49, 49, - 92, 100, 51, 100, 49, 49, - 95, 121, 117, 118, 95, 98, - 116, 55, 48, 57, 46, 104, - 108, 115, 108, 0, 47, 47, - 32, 83, 68, 76, 32, 115, - 104, 97, 100, 101, 114, 44, - 32, 104, 116, 116, 112, 115, - 58, 47, 47, 103, 105, 116, - 104, 117, 98, 46, 99, 111, - 109, 47, 108, 105, 98, 115, - 100, 108, 45, 111, 114, 103, - 47, 83, 68, 76, 47, 98, - 108, 111, 98, 47, 109, 97, - 105, 110, 47, 115, 114, 99, - 47, 114, 101, 110, 100, 101, - 114, 47, 100, 105, 114, 101, - 99, 116, 51, 100, 49, 49, - 47, 83, 68, 76, 95, 115, - 104, 97, 100, 101, 114, 115, - 95, 100, 51, 100, 49, 49, - 46, 99, 10, 10, 84, 101, - 120, 116, 117, 114, 101, 50, - 68, 32, 89, 84, 101, 120, - 116, 117, 114, 101, 32, 58, - 32, 114, 101, 103, 105, 115, - 116, 101, 114, 40, 116, 48, - 41, 59, 10, 84, 101, 120, - 116, 117, 114, 101, 50, 68, - 32, 85, 84, 101, 120, 116, - 117, 114, 101, 32, 58, 32, - 114, 101, 103, 105, 115, 116, - 101, 114, 40, 116, 49, 41, - 59, 10, 84, 101, 120, 116, + 101, 114, 92, 115, 114, 99, + 92, 118, 105, 100, 101, 111, + 45, 114, 101, 110, 100, 101, + 114, 101, 114, 92, 115, 104, + 97, 100, 101, 114, 92, 100, + 51, 100, 49, 49, 92, 100, + 51, 100, 49, 49, 95, 121, + 117, 118, 95, 98, 116, 55, + 48, 57, 46, 104, 108, 115, + 108, 0, 47, 47, 32, 83, + 68, 76, 32, 115, 104, 97, + 100, 101, 114, 44, 32, 104, + 116, 116, 112, 115, 58, 47, + 47, 103, 105, 116, 104, 117, + 98, 46, 99, 111, 109, 47, + 108, 105, 98, 115, 100, 108, + 45, 111, 114, 103, 47, 83, + 68, 76, 47, 98, 108, 111, + 98, 47, 109, 97, 105, 110, + 47, 115, 114, 99, 47, 114, + 101, 110, 100, 101, 114, 47, + 100, 105, 114, 101, 99, 116, + 51, 100, 49, 49, 47, 83, + 68, 76, 95, 115, 104, 97, + 100, 101, 114, 115, 95, 100, + 51, 100, 49, 49, 46, 99, + 10, 10, 84, 101, 120, 116, 117, 114, 101, 50, 68, 32, - 86, 84, 101, 120, 116, 117, + 89, 84, 101, 120, 116, 117, 114, 101, 32, 58, 32, 114, 101, 103, 105, 115, 116, 101, - 114, 40, 116, 50, 41, 59, - 10, 10, 83, 97, 109, 112, - 108, 101, 114, 83, 116, 97, - 116, 101, 32, 76, 105, 110, - 101, 97, 114, 83, 97, 109, - 112, 108, 101, 114, 32, 58, - 32, 114, 101, 103, 105, 115, - 116, 101, 114, 40, 115, 48, - 41, 59, 10, 83, 97, 109, - 112, 108, 101, 114, 83, 116, - 97, 116, 101, 32, 80, 111, - 105, 110, 116, 83, 97, 109, - 112, 108, 101, 114, 32, 32, - 58, 32, 114, 101, 103, 105, - 115, 116, 101, 114, 40, 115, - 49, 41, 59, 10, 10, 115, - 116, 114, 117, 99, 116, 32, - 80, 105, 120, 101, 108, 83, - 104, 97, 100, 101, 114, 73, - 110, 112, 117, 116, 10, 123, - 10, 32, 32, 32, 32, 102, + 114, 40, 116, 48, 41, 59, + 10, 84, 101, 120, 116, 117, + 114, 101, 50, 68, 32, 85, + 84, 101, 120, 116, 117, 114, + 101, 32, 58, 32, 114, 101, + 103, 105, 115, 116, 101, 114, + 40, 116, 49, 41, 59, 10, + 84, 101, 120, 116, 117, 114, + 101, 50, 68, 32, 86, 84, + 101, 120, 116, 117, 114, 101, + 32, 58, 32, 114, 101, 103, + 105, 115, 116, 101, 114, 40, + 116, 50, 41, 59, 10, 10, + 83, 97, 109, 112, 108, 101, + 114, 83, 116, 97, 116, 101, + 32, 76, 105, 110, 101, 97, + 114, 83, 97, 109, 112, 108, + 101, 114, 32, 58, 32, 114, + 101, 103, 105, 115, 116, 101, + 114, 40, 115, 48, 41, 59, + 10, 83, 97, 109, 112, 108, + 101, 114, 83, 116, 97, 116, + 101, 32, 80, 111, 105, 110, + 116, 83, 97, 109, 112, 108, + 101, 114, 32, 32, 58, 32, + 114, 101, 103, 105, 115, 116, + 101, 114, 40, 115, 49, 41, + 59, 10, 10, 115, 116, 114, + 117, 99, 116, 32, 80, 105, + 120, 101, 108, 83, 104, 97, + 100, 101, 114, 73, 110, 112, + 117, 116, 10, 123, 10, 32, + 32, 32, 32, 102, 108, 111, + 97, 116, 52, 32, 112, 111, + 115, 32, 32, 32, 58, 32, + 83, 86, 95, 80, 79, 83, 27, 226, 48, 1, 128, 0, - 0, 0, 42, 146, 41, 255, - 219, 115, 215, 1, 1, 0, + 0, 0, 149, 129, 153, 137, + 194, 123, 215, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1336,11 +1336,11 @@ const BYTE shader_d3d11_yuv_bt709[] = 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 88, 0, 0, 0, 40, 0, + 78, 0, 0, 0, 40, 0, 0, 0, 27, 226, 48, 1, 244, 118, 225, 197, 42, 4, 0, 0, 1, 0, 0, 0, - 87, 0, 0, 0, 88, 0, + 77, 0, 0, 0, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1795,14 +1795,14 @@ const BYTE shader_d3d11_yuv_bt709[] = 10, 0, 24, 21, 7, 16, 0, 0, 1, 0, 1, 0, 14, 0, 23, 21, 0, 16, - 0, 0, 3, 2, 48, 3, + 0, 0, 3, 2, 192, 0, 0, 0, 242, 241, 10, 0, 24, 21, 9, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, 10, 16, 0, 0, 1, 0, 0, 2, 14, 0, 23, 21, 0, 0, 0, 0, - 10, 2, 48, 3, 0, 0, + 10, 2, 192, 0, 0, 0, 242, 241, 10, 0, 24, 21, 12, 16, 0, 0, 1, 0, 1, 0, 10, 0, 24, 21, @@ -1919,50 +1919,50 @@ const BYTE shader_d3d11_yuv_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 116, 46, 116, 101, - 120, 41, 46, 114, 59, 10, - 32, 32, 32, 32, 121, 117, - 118, 46, 122, 32, 61, 32, - 86, 84, 101, 120, 116, 117, - 114, 101, 46, 83, 97, 109, - 112, 108, 101, 40, 76, 105, - 110, 101, 97, 114, 83, 97, - 109, 112, 108, 101, 114, 44, - 32, 105, 110, 112, 117, 116, - 46, 116, 101, 120, 41, 46, - 114, 59, 10, 10, 32, 32, - 32, 32, 121, 117, 118, 32, - 43, 61, 32, 111, 102, 102, - 115, 101, 116, 59, 10, 32, - 32, 32, 32, 79, 117, 116, - 112, 117, 116, 46, 114, 32, - 61, 32, 100, 111, 116, 40, - 121, 117, 118, 44, 32, 82, - 99, 111, 101, 102, 102, 41, - 59, 10, 32, 32, 32, 32, - 79, 117, 116, 112, 117, 116, - 46, 103, 32, 61, 32, 100, - 111, 116, 40, 121, 117, 118, - 44, 32, 71, 99, 111, 101, - 102, 102, 41, 59, 10, 32, - 32, 32, 32, 79, 117, 116, - 112, 117, 116, 46, 98, 32, - 61, 32, 100, 111, 116, 40, - 121, 117, 118, 44, 32, 66, - 99, 111, 101, 102, 102, 41, - 59, 10, 32, 32, 32, 32, - 79, 117, 116, 112, 117, 116, - 46, 97, 32, 61, 32, 49, - 46, 48, 102, 59, 10, 10, - 32, 32, 32, 32, 114, 101, - 116, 117, 114, 110, 32, 79, - 117, 116, 112, 117, 116, 59, - 10, 125, 0, 7, 0, 0, - 0, 0, 0, 0, 0, 87, - 0, 0, 0, 1, 0, 0, - 0, 88, 0, 0, 0, 0, + 0, 0, 61, 32, 86, 84, + 101, 120, 116, 117, 114, 101, + 46, 83, 97, 109, 112, 108, + 101, 40, 76, 105, 110, 101, + 97, 114, 83, 97, 109, 112, + 108, 101, 114, 44, 32, 105, + 110, 112, 117, 116, 46, 116, + 101, 120, 41, 46, 114, 59, + 10, 10, 32, 32, 32, 32, + 121, 117, 118, 32, 43, 61, + 32, 111, 102, 102, 115, 101, + 116, 59, 10, 32, 32, 32, + 32, 79, 117, 116, 112, 117, + 116, 46, 114, 32, 61, 32, + 100, 111, 116, 40, 121, 117, + 118, 44, 32, 82, 99, 111, + 101, 102, 102, 41, 59, 10, + 32, 32, 32, 32, 79, 117, + 116, 112, 117, 116, 46, 103, + 32, 61, 32, 100, 111, 116, + 40, 121, 117, 118, 44, 32, + 71, 99, 111, 101, 102, 102, + 41, 59, 10, 32, 32, 32, + 32, 79, 117, 116, 112, 117, + 116, 46, 98, 32, 61, 32, + 100, 111, 116, 40, 121, 117, + 118, 44, 32, 66, 99, 111, + 101, 102, 102, 41, 59, 10, + 32, 32, 32, 32, 79, 117, + 116, 112, 117, 116, 46, 97, + 32, 61, 32, 49, 46, 48, + 102, 59, 10, 10, 32, 32, + 32, 32, 114, 101, 116, 117, + 114, 110, 32, 79, 117, 116, + 112, 117, 116, 59, 10, 125, + 0, 7, 0, 0, 0, 78, + 0, 0, 0, 77, 0, 0, + 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 154, + 0, 0, 0, 4, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 174, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2437,7 +2437,7 @@ const BYTE shader_d3d11_yuv_bt709[] = 14, 0, 63, 92, 15, 0, 0, 0, 76, 0, 0, 0, 32, 0, 0, 0, 44, 0, - 0, 0, 100, 0, 0, 0, + 0, 0, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 25, 0, 0, 0, 0, 0, @@ -2445,20 +2445,20 @@ const BYTE shader_d3d11_yuv_bt709[] = 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 100, 2, 0, 0, 32, 0, - 0, 96, 0, 0, 0, 0, + 0, 96, 0, 0, 190, 93, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 9, 0, 152, 5, 0, 0, 0, 0, 0, 0, 44, 2, 0, 0, - 1, 0, 0, 0, 8, 163, - 86, 3, 0, 0, 0, 0, + 1, 0, 0, 0, 192, 178, + 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 105, 110, 0, 110, 111, 110, 101, 0, 0, 0, 45, 186, 46, 241, 1, 0, 0, 0, 0, 0, 0, 0, 100, 2, 0, 0, 32, 0, 0, 96, - 0, 0, 0, 0, 0, 0, + 0, 0, 190, 93, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 7, 0, 0, 0, 0, 0, 1, 0, @@ -2469,21 +2469,19 @@ const BYTE shader_d3d11_yuv_bt709[] = 0, 0, 0, 0, 255, 255, 255, 255, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 71, 58, 92, 118, + 0, 0, 71, 58, 92, 103, + 105, 116, 49, 92, 118, 105, + 100, 101, 111, 45, 114, 101, + 110, 100, 101, 114, 101, 114, + 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, 101, - 114, 92, 118, 105, 100, 101, - 111, 45, 114, 101, 110, 100, - 101, 114, 101, 114, 92, 115, - 114, 99, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 104, 97, 100, 101, 114, - 92, 100, 51, 100, 49, 49, - 92, 100, 51, 100, 49, 49, - 95, 121, 117, 118, 95, 98, - 116, 55, 48, 57, 46, 104, - 108, 115, 108, 0, 0, 0, + 114, 92, 115, 104, 97, 100, + 101, 114, 92, 100, 51, 100, + 49, 49, 92, 100, 51, 100, + 49, 49, 95, 121, 117, 118, + 95, 98, 116, 55, 48, 57, + 46, 104, 108, 115, 108, 0, 254, 239, 254, 239, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, @@ -2516,12 +2514,14 @@ const BYTE shader_d3d11_yuv_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 46, - 49, 1, 226, 197, 230, 96, - 1, 0, 0, 0, 232, 217, - 109, 74, 19, 90, 55, 75, - 145, 177, 73, 48, 236, 24, - 210, 152, 131, 0, 0, 0, + 49, 1, 37, 7, 244, 96, + 1, 0, 0, 0, 200, 118, + 246, 151, 75, 199, 102, 75, + 152, 107, 9, 86, 139, 165, + 190, 93, 121, 0, 0, 0, 47, 76, 105, 110, 107, 73, 110, 102, 111, 0, 47, 110, 97, 109, 101, 115, 0, 47, @@ -2530,30 +2530,30 @@ const BYTE shader_d3d11_yuv_bt709[] = 111, 99, 107, 0, 47, 115, 114, 99, 47, 102, 105, 108, 101, 115, 47, 103, 58, 92, + 103, 105, 116, 49, 92, 118, + 105, 100, 101, 111, 45, 114, + 101, 110, 100, 101, 114, 101, + 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, 114, - 101, 114, 92, 118, 105, 100, - 101, 111, 45, 114, 101, 110, - 100, 101, 114, 101, 114, 92, - 115, 114, 99, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 104, 97, 100, 101, - 114, 92, 100, 51, 100, 49, - 49, 92, 100, 51, 100, 49, - 49, 95, 121, 117, 118, 95, - 98, 116, 55, 48, 57, 46, - 104, 108, 115, 108, 0, 4, - 0, 0, 0, 6, 0, 0, - 0, 1, 0, 0, 0, 27, - 0, 0, 0, 0, 0, 0, - 0, 34, 0, 0, 0, 8, + 101, 114, 92, 115, 104, 97, + 100, 101, 114, 92, 100, 51, + 100, 49, 49, 92, 100, 51, + 100, 49, 49, 95, 121, 117, + 118, 95, 98, 116, 55, 48, + 57, 46, 104, 108, 115, 108, + 0, 4, 0, 0, 0, 6, + 0, 0, 0, 1, 0, 0, + 0, 30, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, - 0, 7, 0, 0, 0, 10, - 0, 0, 0, 6, 0, 0, - 0, 0, 0, 0, 0, 5, + 0, 7, 0, 0, 0, 34, + 0, 0, 0, 8, 0, 0, + 0, 10, 0, 0, 0, 6, + 0, 0, 0, 0, 0, 0, + 0, 5, 0, 0, 0, 0, + 0, 0, 0, 220, 81, 51, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 220, 81, 51, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2603,10 +2603,10 @@ const BYTE shader_d3d11_yuv_bt709[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 32, 0, - 0, 0, 223, 0, 0, 0, - 96, 1, 0, 0, 107, 1, + 0, 0, 213, 0, 0, 0, + 96, 1, 0, 0, 95, 1, 0, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 9, 5, + 0, 0, 0, 0, 245, 4, 0, 0, 128, 0, 0, 0, 42, 4, 0, 0, 220, 7, 0, 0, 68, 0, 0, 0, diff --git a/src/video-renderer/shader/d3d9/d3d9_sharpness.hlsl b/src/video-renderer/shader/d3d9/d3d9_sharpness.hlsl index 377ff97..8b0963f 100644 --- a/src/video-renderer/shader/d3d9/d3d9_sharpness.hlsl +++ b/src/video-renderer/shader/d3d9/d3d9_sharpness.hlsl @@ -8,7 +8,7 @@ sampler ImageSampler = sampler_state Texture = ; MinFilter = LINEAR; MagFilter = LINEAR; - MipFilter = NONE; + MipFilter = POINT; AddressU = WRAP; AddressV = WRAP; }; diff --git a/src/video-renderer/shader/d3d9/d3d9_yuv_bt601.hlsl b/src/video-renderer/shader/d3d9/d3d9_yuv_bt601.hlsl index 5ab366c..0be895b 100644 --- a/src/video-renderer/shader/d3d9/d3d9_yuv_bt601.hlsl +++ b/src/video-renderer/shader/d3d9/d3d9_yuv_bt601.hlsl @@ -9,7 +9,7 @@ sampler YSampler = sampler_state Texture = ; magfilter = LINEAR; minfilter = LINEAR; - mipfilter = NONE; + mipfilter = POINT; AddressU = CLAMP; AddressV = CLAMP; }; @@ -19,7 +19,7 @@ sampler USampler = sampler_state Texture = ; magfilter = LINEAR; minfilter = LINEAR; - mipfilter = NONE; + mipfilter = POINT; AddressU = CLAMP; AddressV = CLAMP; }; @@ -29,7 +29,7 @@ sampler VSampler = sampler_state Texture = ; magfilter = LINEAR; minfilter = LINEAR; - mipfilter = NONE; + mipfilter = POINT; AddressU = CLAMP; AddressV = CLAMP; }; diff --git a/src/video-renderer/shader/d3d9/d3d9_yuv_bt709.hlsl b/src/video-renderer/shader/d3d9/d3d9_yuv_bt709.hlsl index 7c3c603..cf3280f 100644 --- a/src/video-renderer/shader/d3d9/d3d9_yuv_bt709.hlsl +++ b/src/video-renderer/shader/d3d9/d3d9_yuv_bt709.hlsl @@ -9,7 +9,7 @@ sampler YSampler = sampler_state Texture = ; magfilter = LINEAR; minfilter = LINEAR; - mipfilter = NONE; + mipfilter = POINT; AddressU = CLAMP; AddressV = CLAMP; }; @@ -19,7 +19,7 @@ sampler USampler = sampler_state Texture = ; magfilter = LINEAR; minfilter = LINEAR; - mipfilter = NONE; + mipfilter = POINT; AddressU = CLAMP; AddressV = CLAMP; }; @@ -29,7 +29,7 @@ sampler VSampler = sampler_state Texture = ; magfilter = LINEAR; minfilter = LINEAR; - mipfilter = NONE; + mipfilter = POINT; AddressU = CLAMP; AddressV = CLAMP; }; diff --git a/src/video-renderer/shader/d3d9/shader_d3d9_sharpness.h b/src/video-renderer/shader/d3d9/shader_d3d9_sharpness.h index b1e173f..7901332 100644 --- a/src/video-renderer/shader/d3d9/shader_d3d9_sharpness.h +++ b/src/video-renderer/shader/d3d9/shader_d3d9_sharpness.h @@ -28,7 +28,7 @@ dcl t0.xy // input<4,5> dcl_2d s0 -#line 30 "G:\video-renderer\video-renderer\src\video-renderer\shader\d3d9\d3d9_sharpness.hlsl" +#line 30 "G:\git1\video-renderer\src\video-renderer\shader\d3d9\d3d9_sharpness.hlsl" rcp r0.w, c0.x mul r0.x, r0.w, c3.x // ::ps<0> rcp r0.z, c1.x @@ -93,357 +93,355 @@ const BYTE shader_d3d9_sharpness[] = { 0, 2, 255, 255, 254, 255, - 5, 1, 68, 66, 85, 71, - 40, 0, 0, 0, 232, 3, + 3, 1, 68, 66, 85, 71, + 40, 0, 0, 0, 224, 3, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 124, 0, + 1, 0, 0, 0, 116, 0, 0, 0, 51, 0, 0, 0, - 128, 0, 0, 0, 9, 0, - 0, 0, 52, 3, 0, 0, - 24, 2, 0, 0, 71, 58, + 120, 0, 0, 0, 9, 0, + 0, 0, 44, 3, 0, 0, + 16, 2, 0, 0, 71, 58, + 92, 103, 105, 116, 49, 92, + 118, 105, 100, 101, 111, 45, + 114, 101, 110, 100, 101, 114, + 101, 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, - 114, 101, 114, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 114, 99, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 104, 97, 100, - 101, 114, 92, 100, 51, 100, - 57, 92, 100, 51, 100, 57, - 95, 115, 104, 97, 114, 112, - 110, 101, 115, 115, 46, 104, - 108, 115, 108, 0, 40, 0, + 114, 101, 114, 92, 115, 104, + 97, 100, 101, 114, 92, 100, + 51, 100, 57, 92, 100, 51, + 100, 57, 95, 115, 104, 97, + 114, 112, 110, 101, 115, 115, + 46, 104, 108, 115, 108, 0, + 171, 171, 40, 0, 0, 0, + 0, 0, 255, 255, 0, 5, 0, 0, 0, 0, 255, 255, - 8, 5, 0, 0, 0, 0, - 255, 255, 32, 5, 0, 0, - 0, 0, 255, 255, 56, 5, + 24, 5, 0, 0, 0, 0, + 255, 255, 48, 5, 0, 0, + 0, 0, 255, 255, 72, 5, 0, 0, 0, 0, 255, 255, - 80, 5, 0, 0, 0, 0, - 255, 255, 104, 5, 0, 0, - 0, 0, 255, 255, 116, 5, + 96, 5, 0, 0, 0, 0, + 255, 255, 108, 5, 0, 0, + 30, 0, 0, 0, 120, 5, 0, 0, 30, 0, 0, 0, - 128, 5, 0, 0, 30, 0, - 0, 0, 140, 5, 0, 0, - 30, 0, 0, 0, 156, 5, - 0, 0, 30, 0, 0, 0, - 168, 5, 0, 0, 31, 0, - 0, 0, 184, 5, 0, 0, - 33, 0, 0, 0, 200, 5, - 0, 0, 33, 0, 0, 0, - 216, 5, 0, 0, 34, 0, - 0, 0, 232, 5, 0, 0, - 34, 0, 0, 0, 248, 5, + 132, 5, 0, 0, 30, 0, + 0, 0, 148, 5, 0, 0, + 30, 0, 0, 0, 160, 5, + 0, 0, 31, 0, 0, 0, + 176, 5, 0, 0, 33, 0, + 0, 0, 192, 5, 0, 0, + 33, 0, 0, 0, 208, 5, + 0, 0, 34, 0, 0, 0, + 224, 5, 0, 0, 34, 0, + 0, 0, 240, 5, 0, 0, + 35, 0, 0, 0, 0, 6, 0, 0, 35, 0, 0, 0, - 8, 6, 0, 0, 35, 0, - 0, 0, 24, 6, 0, 0, - 36, 0, 0, 0, 40, 6, - 0, 0, 36, 0, 0, 0, - 56, 6, 0, 0, 37, 0, - 0, 0, 72, 6, 0, 0, - 38, 0, 0, 0, 88, 6, - 0, 0, 38, 0, 0, 0, - 104, 6, 0, 0, 39, 0, - 0, 0, 120, 6, 0, 0, - 39, 0, 0, 0, 136, 6, + 16, 6, 0, 0, 36, 0, + 0, 0, 32, 6, 0, 0, + 36, 0, 0, 0, 48, 6, + 0, 0, 37, 0, 0, 0, + 64, 6, 0, 0, 38, 0, + 0, 0, 80, 6, 0, 0, + 38, 0, 0, 0, 96, 6, + 0, 0, 39, 0, 0, 0, + 112, 6, 0, 0, 39, 0, + 0, 0, 128, 6, 0, 0, + 40, 0, 0, 0, 144, 6, 0, 0, 40, 0, 0, 0, - 152, 6, 0, 0, 40, 0, - 0, 0, 168, 6, 0, 0, - 41, 0, 0, 0, 184, 6, - 0, 0, 41, 0, 0, 0, - 200, 6, 0, 0, 32, 0, - 0, 0, 216, 6, 0, 0, - 33, 0, 0, 0, 232, 6, - 0, 0, 34, 0, 0, 0, - 248, 6, 0, 0, 35, 0, - 0, 0, 8, 7, 0, 0, - 36, 0, 0, 0, 24, 7, - 0, 0, 38, 0, 0, 0, - 40, 7, 0, 0, 39, 0, - 0, 0, 56, 7, 0, 0, - 40, 0, 0, 0, 72, 7, - 0, 0, 41, 0, 0, 0, - 88, 7, 0, 0, 33, 0, - 0, 0, 104, 7, 0, 0, - 33, 0, 0, 0, 120, 7, + 160, 6, 0, 0, 41, 0, + 0, 0, 176, 6, 0, 0, + 41, 0, 0, 0, 192, 6, + 0, 0, 32, 0, 0, 0, + 208, 6, 0, 0, 33, 0, + 0, 0, 224, 6, 0, 0, + 34, 0, 0, 0, 240, 6, + 0, 0, 35, 0, 0, 0, + 0, 7, 0, 0, 36, 0, + 0, 0, 16, 7, 0, 0, + 38, 0, 0, 0, 32, 7, + 0, 0, 39, 0, 0, 0, + 48, 7, 0, 0, 40, 0, + 0, 0, 64, 7, 0, 0, + 41, 0, 0, 0, 80, 7, 0, 0, 33, 0, 0, 0, - 136, 7, 0, 0, 38, 0, - 0, 0, 152, 7, 0, 0, - 38, 0, 0, 0, 168, 7, + 96, 7, 0, 0, 33, 0, + 0, 0, 112, 7, 0, 0, + 33, 0, 0, 0, 128, 7, 0, 0, 38, 0, 0, 0, - 184, 7, 0, 0, 42, 0, - 0, 0, 200, 7, 0, 0, - 42, 0, 0, 0, 216, 7, + 144, 7, 0, 0, 38, 0, + 0, 0, 160, 7, 0, 0, + 38, 0, 0, 0, 176, 7, + 0, 0, 42, 0, 0, 0, + 192, 7, 0, 0, 42, 0, + 0, 0, 208, 7, 0, 0, + 42, 0, 0, 0, 224, 7, 0, 0, 42, 0, 0, 0, - 232, 7, 0, 0, 42, 0, - 0, 0, 248, 7, 0, 0, - 42, 0, 0, 0, 8, 8, + 240, 7, 0, 0, 42, 0, + 0, 0, 0, 8, 0, 0, + 43, 0, 0, 0, 16, 8, 0, 0, 43, 0, 0, 0, - 24, 8, 0, 0, 43, 0, - 0, 0, 40, 8, 0, 0, - 28, 0, 0, 0, 56, 8, - 0, 0, 109, 97, 105, 110, - 0, 105, 110, 112, 117, 116, - 0, 112, 111, 115, 0, 171, - 1, 0, 3, 0, 1, 0, - 4, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 117, 118, - 0, 171, 1, 0, 3, 0, - 1, 0, 2, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 99, 111, 108, 111, 114, 0, - 171, 171, 35, 2, 0, 0, - 40, 2, 0, 0, 56, 2, - 0, 0, 60, 2, 0, 0, - 76, 2, 0, 0, 40, 2, - 0, 0, 5, 0, 0, 0, - 1, 0, 10, 0, 1, 0, - 3, 0, 84, 2, 0, 0, - 4, 0, 0, 0, 4, 0, - 5, 0, 255, 255, 255, 255, + 32, 8, 0, 0, 28, 0, + 0, 0, 48, 8, 0, 0, + 109, 97, 105, 110, 0, 105, + 110, 112, 117, 116, 0, 112, + 111, 115, 0, 171, 1, 0, + 3, 0, 1, 0, 4, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 117, 118, 0, 171, 1, 0, 3, 0, 1, 0, - 4, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 49, 0, - 0, 0, 0, 0, 1, 0, - 2, 0, 3, 0, 50, 0, - 0, 0, 0, 0, 1, 0, - 2, 0, 3, 0, 112, 0, - 171, 171, 28, 0, 0, 0, + 2, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 99, 111, + 108, 111, 114, 0, 171, 171, + 27, 2, 0, 0, 32, 2, + 0, 0, 48, 2, 0, 0, + 52, 2, 0, 0, 68, 2, + 0, 0, 32, 2, 0, 0, + 5, 0, 0, 0, 1, 0, + 10, 0, 1, 0, 3, 0, + 76, 2, 0, 0, 4, 0, + 0, 0, 4, 0, 5, 0, + 255, 255, 255, 255, 1, 0, + 3, 0, 1, 0, 4, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 49, 0, 0, 0, 0, 0, 1, 0, 2, 0, - 3, 0, 112, 115, 0, 171, - 7, 0, 0, 0, 0, 0, - 255, 255, 255, 255, 255, 255, - 9, 0, 0, 0, 255, 255, - 1, 0, 255, 255, 255, 255, - 115, 116, 49, 0, 10, 0, - 0, 0, 255, 255, 255, 255, - 1, 0, 0, 0, 115, 116, - 50, 0, 19, 0, 0, 0, - 0, 0, 1, 0, 255, 255, - 255, 255, 115, 117, 109, 49, - 0, 171, 171, 171, 39, 0, - 0, 0, 0, 0, 1, 0, - 2, 0, 3, 0, 115, 117, - 109, 50, 0, 171, 171, 171, - 42, 0, 0, 0, 0, 0, + 3, 0, 50, 0, 0, 0, + 0, 0, 1, 0, 2, 0, + 3, 0, 112, 0, 171, 171, + 28, 0, 0, 0, 0, 0, 1, 0, 2, 0, 3, 0, - 116, 0, 171, 171, 47, 0, + 112, 115, 0, 171, 7, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 255, 255, 9, 0, + 0, 0, 255, 255, 1, 0, + 255, 255, 255, 255, 115, 116, + 49, 0, 10, 0, 0, 0, + 255, 255, 255, 255, 1, 0, + 0, 0, 115, 116, 50, 0, + 19, 0, 0, 0, 0, 0, + 1, 0, 255, 255, 255, 255, + 115, 117, 109, 49, 0, 171, + 171, 171, 39, 0, 0, 0, + 0, 0, 1, 0, 2, 0, + 3, 0, 115, 117, 109, 50, + 0, 171, 171, 171, 42, 0, 0, 0, 0, 0, 1, 0, - 2, 0, 3, 0, 24, 2, - 0, 0, 29, 2, 0, 0, - 108, 2, 0, 0, 1, 0, - 0, 0, 124, 2, 0, 0, - 0, 0, 0, 0, 24, 2, - 0, 0, 136, 2, 0, 0, - 2, 0, 0, 0, 152, 2, - 0, 0, 0, 0, 0, 0, - 176, 2, 0, 0, 40, 2, + 2, 0, 3, 0, 116, 0, + 171, 171, 47, 0, 0, 0, + 0, 0, 1, 0, 2, 0, + 3, 0, 16, 2, 0, 0, + 21, 2, 0, 0, 100, 2, 0, 0, 1, 0, 0, 0, - 180, 2, 0, 0, 0, 0, - 0, 0, 192, 2, 0, 0, - 60, 2, 0, 0, 2, 0, - 0, 0, 196, 2, 0, 0, - 0, 0, 0, 0, 220, 2, - 0, 0, 60, 2, 0, 0, - 1, 0, 0, 0, 224, 2, + 116, 2, 0, 0, 0, 0, + 0, 0, 16, 2, 0, 0, + 128, 2, 0, 0, 2, 0, + 0, 0, 144, 2, 0, 0, + 0, 0, 0, 0, 168, 2, + 0, 0, 32, 2, 0, 0, + 1, 0, 0, 0, 172, 2, 0, 0, 0, 0, 0, 0, - 236, 2, 0, 0, 60, 2, - 0, 0, 1, 0, 0, 0, - 240, 2, 0, 0, 0, 0, - 0, 0, 252, 2, 0, 0, - 40, 2, 0, 0, 1, 0, - 0, 0, 4, 3, 0, 0, - 0, 0, 0, 0, 16, 3, - 0, 0, 40, 2, 0, 0, - 1, 0, 0, 0, 24, 3, + 184, 2, 0, 0, 52, 2, + 0, 0, 2, 0, 0, 0, + 188, 2, 0, 0, 0, 0, + 0, 0, 212, 2, 0, 0, + 52, 2, 0, 0, 1, 0, + 0, 0, 216, 2, 0, 0, + 0, 0, 0, 0, 228, 2, + 0, 0, 52, 2, 0, 0, + 1, 0, 0, 0, 232, 2, 0, 0, 0, 0, 0, 0, - 36, 3, 0, 0, 40, 2, + 244, 2, 0, 0, 32, 2, + 0, 0, 1, 0, 0, 0, + 252, 2, 0, 0, 0, 0, + 0, 0, 8, 3, 0, 0, + 32, 2, 0, 0, 1, 0, + 0, 0, 16, 3, 0, 0, + 0, 0, 0, 0, 28, 3, + 0, 0, 32, 2, 0, 0, + 1, 0, 0, 0, 32, 3, + 0, 0, 77, 105, 99, 114, + 111, 115, 111, 102, 116, 32, + 40, 82, 41, 32, 72, 76, + 83, 76, 32, 83, 104, 97, + 100, 101, 114, 32, 67, 111, + 109, 112, 105, 108, 101, 114, + 32, 49, 48, 46, 49, 0, + 254, 255, 58, 0, 67, 84, + 65, 66, 28, 0, 0, 0, + 185, 0, 0, 0, 0, 2, + 255, 255, 4, 0, 0, 0, + 28, 0, 0, 0, 5, 1, + 0, 0, 178, 0, 0, 0, + 108, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, - 40, 3, 0, 0, 77, 105, - 99, 114, 111, 115, 111, 102, - 116, 32, 40, 82, 41, 32, - 72, 76, 83, 76, 32, 83, - 104, 97, 100, 101, 114, 32, - 67, 111, 109, 112, 105, 108, - 101, 114, 32, 49, 48, 46, - 49, 0, 254, 255, 58, 0, - 67, 84, 65, 66, 28, 0, - 0, 0, 185, 0, 0, 0, - 0, 2, 255, 255, 4, 0, - 0, 0, 28, 0, 0, 0, - 5, 1, 0, 0, 178, 0, - 0, 0, 108, 0, 0, 0, - 3, 0, 0, 0, 1, 0, - 0, 0, 124, 0, 0, 0, - 0, 0, 0, 0, 140, 0, - 0, 0, 2, 0, 1, 0, - 1, 0, 6, 0, 148, 0, + 124, 0, 0, 0, 0, 0, + 0, 0, 140, 0, 0, 0, + 2, 0, 1, 0, 1, 0, + 6, 0, 148, 0, 0, 0, + 0, 0, 0, 0, 164, 0, + 0, 0, 2, 0, 2, 0, + 1, 0, 10, 0, 148, 0, 0, 0, 0, 0, 0, 0, - 164, 0, 0, 0, 2, 0, - 2, 0, 1, 0, 10, 0, + 172, 0, 0, 0, 2, 0, + 0, 0, 1, 0, 2, 0, 148, 0, 0, 0, 0, 0, - 0, 0, 172, 0, 0, 0, - 2, 0, 0, 0, 1, 0, - 2, 0, 148, 0, 0, 0, - 0, 0, 0, 0, 73, 109, - 97, 103, 101, 83, 97, 109, - 112, 108, 101, 114, 0, 171, - 171, 171, 4, 0, 12, 0, - 1, 0, 1, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 104, 101, 105, 103, 104, 116, - 0, 171, 0, 0, 3, 0, - 1, 0, 1, 0, 1, 0, + 0, 0, 73, 109, 97, 103, + 101, 83, 97, 109, 112, 108, + 101, 114, 0, 171, 171, 171, + 4, 0, 12, 0, 1, 0, + 1, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 104, 101, + 105, 103, 104, 116, 0, 171, + 0, 0, 3, 0, 1, 0, + 1, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 117, 110, + 115, 104, 97, 114, 112, 0, + 119, 105, 100, 116, 104, 0, + 112, 115, 95, 50, 95, 48, + 0, 77, 105, 99, 114, 111, + 115, 111, 102, 116, 32, 40, + 82, 41, 32, 72, 76, 83, + 76, 32, 83, 104, 97, 100, + 101, 114, 32, 67, 111, 109, + 112, 105, 108, 101, 114, 32, + 49, 48, 46, 49, 0, 171, + 171, 171, 81, 0, 0, 5, + 3, 0, 15, 160, 0, 0, + 128, 63, 154, 153, 153, 63, + 0, 0, 128, 191, 0, 0, + 128, 63, 81, 0, 0, 5, + 4, 0, 15, 160, 0, 0, + 192, 63, 0, 0, 128, 63, 0, 0, 0, 0, 0, 0, - 117, 110, 115, 104, 97, 114, - 112, 0, 119, 105, 100, 116, - 104, 0, 112, 115, 95, 50, - 95, 48, 0, 77, 105, 99, - 114, 111, 115, 111, 102, 116, - 32, 40, 82, 41, 32, 72, - 76, 83, 76, 32, 83, 104, - 97, 100, 101, 114, 32, 67, - 111, 109, 112, 105, 108, 101, - 114, 32, 49, 48, 46, 49, - 0, 171, 171, 171, 81, 0, - 0, 5, 3, 0, 15, 160, - 0, 0, 128, 63, 154, 153, - 153, 63, 0, 0, 128, 191, - 0, 0, 128, 63, 81, 0, - 0, 5, 4, 0, 15, 160, - 0, 0, 192, 63, 0, 0, - 128, 63, 0, 0, 0, 0, - 0, 0, 128, 191, 81, 0, - 0, 5, 5, 0, 15, 160, - 0, 0, 92, 63, 0, 0, - 240, 189, 0, 0, 200, 189, - 0, 0, 0, 0, 81, 0, - 0, 5, 6, 0, 15, 160, - 0, 0, 0, 0, 0, 0, - 128, 63, 0, 0, 128, 191, - 0, 0, 0, 0, 31, 0, - 0, 2, 0, 0, 0, 128, - 0, 0, 3, 176, 31, 0, - 0, 2, 0, 0, 0, 144, - 0, 8, 15, 160, 6, 0, - 0, 2, 0, 0, 8, 128, - 0, 0, 0, 160, 5, 0, - 0, 3, 0, 0, 1, 128, - 0, 0, 255, 128, 3, 0, - 0, 160, 6, 0, 0, 2, - 0, 0, 4, 128, 1, 0, + 128, 191, 81, 0, 0, 5, + 5, 0, 15, 160, 0, 0, + 92, 63, 0, 0, 240, 189, + 0, 0, 200, 189, 0, 0, + 0, 0, 81, 0, 0, 5, + 6, 0, 15, 160, 0, 0, + 0, 0, 0, 0, 128, 63, + 0, 0, 128, 191, 0, 0, + 0, 0, 31, 0, 0, 2, + 0, 0, 0, 128, 0, 0, + 3, 176, 31, 0, 0, 2, + 0, 0, 0, 144, 0, 8, + 15, 160, 6, 0, 0, 2, + 0, 0, 8, 128, 0, 0, 0, 160, 5, 0, 0, 3, - 0, 0, 2, 128, 0, 0, - 170, 128, 3, 0, 0, 160, + 0, 0, 1, 128, 0, 0, + 255, 128, 3, 0, 0, 160, + 6, 0, 0, 2, 0, 0, + 4, 128, 1, 0, 0, 160, 5, 0, 0, 3, 0, 0, - 12, 128, 0, 0, 27, 128, - 3, 0, 85, 160, 5, 0, - 0, 3, 1, 0, 3, 128, + 2, 128, 0, 0, 170, 128, + 3, 0, 0, 160, 5, 0, + 0, 3, 0, 0, 12, 128, 0, 0, 27, 128, 3, 0, - 0, 160, 2, 0, 0, 3, - 1, 0, 3, 128, 1, 0, - 228, 128, 0, 0, 228, 176, - 5, 0, 0, 3, 1, 0, - 12, 128, 0, 0, 228, 128, - 3, 0, 228, 160, 2, 0, - 0, 3, 2, 0, 3, 128, - 1, 0, 27, 128, 0, 0, - 228, 176, 5, 0, 0, 3, - 3, 0, 3, 128, 0, 0, - 27, 128, 3, 0, 210, 160, - 2, 0, 0, 3, 3, 0, - 3, 128, 3, 0, 228, 128, + 85, 160, 5, 0, 0, 3, + 1, 0, 3, 128, 0, 0, + 27, 128, 3, 0, 0, 160, + 2, 0, 0, 3, 1, 0, + 3, 128, 1, 0, 228, 128, 0, 0, 228, 176, 5, 0, - 0, 3, 0, 0, 12, 128, + 0, 3, 1, 0, 12, 128, 0, 0, 228, 128, 3, 0, - 170, 160, 2, 0, 0, 3, - 4, 0, 3, 128, 0, 0, + 228, 160, 2, 0, 0, 3, + 2, 0, 3, 128, 1, 0, 27, 128, 0, 0, 228, 176, - 5, 0, 0, 3, 0, 0, - 3, 128, 0, 0, 228, 128, - 4, 0, 0, 160, 5, 0, - 0, 3, 5, 0, 3, 128, - 0, 0, 228, 128, 4, 0, - 201, 160, 2, 0, 0, 3, - 5, 0, 3, 128, 5, 0, - 228, 128, 0, 0, 228, 176, - 5, 0, 0, 3, 0, 0, - 12, 128, 0, 0, 27, 128, - 6, 0, 27, 160, 2, 0, - 0, 3, 6, 0, 3, 128, - 0, 0, 27, 128, 0, 0, + 5, 0, 0, 3, 3, 0, + 3, 128, 0, 0, 27, 128, + 3, 0, 210, 160, 2, 0, + 0, 3, 3, 0, 3, 128, + 3, 0, 228, 128, 0, 0, 228, 176, 5, 0, 0, 3, 0, 0, 12, 128, 0, 0, - 27, 128, 4, 0, 228, 160, - 2, 0, 0, 3, 7, 0, + 228, 128, 3, 0, 170, 160, + 2, 0, 0, 3, 4, 0, 3, 128, 0, 0, 27, 128, 0, 0, 228, 176, 5, 0, 0, 3, 0, 0, 3, 128, - 0, 0, 228, 128, 6, 0, + 0, 0, 228, 128, 4, 0, + 0, 160, 5, 0, 0, 3, + 5, 0, 3, 128, 0, 0, + 228, 128, 4, 0, 201, 160, + 2, 0, 0, 3, 5, 0, + 3, 128, 5, 0, 228, 128, + 0, 0, 228, 176, 5, 0, + 0, 3, 0, 0, 12, 128, + 0, 0, 27, 128, 6, 0, 27, 160, 2, 0, 0, 3, + 6, 0, 3, 128, 0, 0, + 27, 128, 0, 0, 228, 176, + 5, 0, 0, 3, 0, 0, + 12, 128, 0, 0, 27, 128, + 4, 0, 228, 160, 2, 0, + 0, 3, 7, 0, 3, 128, + 0, 0, 27, 128, 0, 0, + 228, 176, 5, 0, 0, 3, 0, 0, 3, 128, 0, 0, - 228, 128, 0, 0, 228, 176, - 66, 0, 0, 3, 8, 0, - 15, 128, 0, 0, 228, 176, - 0, 8, 228, 160, 66, 0, - 0, 3, 1, 0, 15, 128, - 1, 0, 228, 128, 0, 8, + 228, 128, 6, 0, 27, 160, + 2, 0, 0, 3, 0, 0, + 3, 128, 0, 0, 228, 128, + 0, 0, 228, 176, 66, 0, + 0, 3, 8, 0, 15, 128, + 0, 0, 228, 176, 0, 8, 228, 160, 66, 0, 0, 3, - 2, 0, 15, 128, 2, 0, + 1, 0, 15, 128, 1, 0, 228, 128, 0, 8, 228, 160, - 66, 0, 0, 3, 3, 0, - 15, 128, 3, 0, 228, 128, + 66, 0, 0, 3, 2, 0, + 15, 128, 2, 0, 228, 128, 0, 8, 228, 160, 66, 0, - 0, 3, 4, 0, 15, 128, - 4, 0, 228, 128, 0, 8, + 0, 3, 3, 0, 15, 128, + 3, 0, 228, 128, 0, 8, 228, 160, 66, 0, 0, 3, - 5, 0, 15, 128, 5, 0, + 4, 0, 15, 128, 4, 0, 228, 128, 0, 8, 228, 160, - 66, 0, 0, 3, 6, 0, - 15, 128, 6, 0, 228, 128, + 66, 0, 0, 3, 5, 0, + 15, 128, 5, 0, 228, 128, 0, 8, 228, 160, 66, 0, - 0, 3, 7, 0, 15, 128, - 7, 0, 228, 128, 0, 8, + 0, 3, 6, 0, 15, 128, + 6, 0, 228, 128, 0, 8, 228, 160, 66, 0, 0, 3, - 0, 0, 15, 128, 0, 0, + 7, 0, 15, 128, 7, 0, 228, 128, 0, 8, 228, 160, - 2, 0, 0, 3, 1, 0, - 15, 128, 1, 0, 228, 128, - 2, 0, 228, 128, 2, 0, + 66, 0, 0, 3, 0, 0, + 15, 128, 0, 0, 228, 128, + 0, 8, 228, 160, 2, 0, 0, 3, 1, 0, 15, 128, - 3, 0, 228, 128, 1, 0, + 1, 0, 228, 128, 2, 0, 228, 128, 2, 0, 0, 3, - 1, 0, 15, 128, 4, 0, + 1, 0, 15, 128, 3, 0, 228, 128, 1, 0, 228, 128, - 2, 0, 0, 3, 2, 0, - 15, 128, 5, 0, 228, 128, - 6, 0, 228, 128, 2, 0, + 2, 0, 0, 3, 1, 0, + 15, 128, 4, 0, 228, 128, + 1, 0, 228, 128, 2, 0, 0, 3, 2, 0, 15, 128, - 7, 0, 228, 128, 2, 0, + 5, 0, 228, 128, 6, 0, 228, 128, 2, 0, 0, 3, - 0, 0, 15, 128, 0, 0, + 2, 0, 15, 128, 7, 0, 228, 128, 2, 0, 228, 128, - 5, 0, 0, 3, 2, 0, - 15, 128, 8, 0, 228, 128, - 5, 0, 0, 160, 5, 0, - 0, 3, 0, 0, 15, 128, - 0, 0, 228, 128, 5, 0, - 85, 160, 2, 0, 0, 3, - 0, 0, 15, 128, 0, 0, - 228, 128, 2, 0, 228, 128, - 5, 0, 0, 3, 1, 0, - 15, 128, 1, 0, 228, 128, - 5, 0, 170, 160, 2, 0, - 0, 3, 0, 0, 15, 128, - 0, 0, 228, 128, 1, 0, - 228, 128, 5, 0, 0, 3, + 2, 0, 0, 3, 0, 0, + 15, 128, 0, 0, 228, 128, + 2, 0, 228, 128, 5, 0, + 0, 3, 2, 0, 15, 128, + 8, 0, 228, 128, 5, 0, + 0, 160, 5, 0, 0, 3, 0, 0, 15, 128, 0, 0, - 228, 128, 2, 0, 0, 160, + 228, 128, 5, 0, 85, 160, 2, 0, 0, 3, 0, 0, 15, 128, 0, 0, 228, 128, - 8, 0, 228, 128, 1, 0, - 0, 2, 0, 8, 15, 128, - 0, 0, 228, 128, 255, 255, - 0, 0 + 2, 0, 228, 128, 5, 0, + 0, 3, 1, 0, 15, 128, + 1, 0, 228, 128, 5, 0, + 170, 160, 2, 0, 0, 3, + 0, 0, 15, 128, 0, 0, + 228, 128, 1, 0, 228, 128, + 5, 0, 0, 3, 0, 0, + 15, 128, 0, 0, 228, 128, + 2, 0, 0, 160, 2, 0, + 0, 3, 0, 0, 15, 128, + 0, 0, 228, 128, 8, 0, + 228, 128, 1, 0, 0, 2, + 0, 8, 15, 128, 0, 0, + 228, 128, 255, 255, 0, 0 }; diff --git a/src/video-renderer/shader/d3d9/shader_d3d9_yuv_bt601.h b/src/video-renderer/shader/d3d9/shader_d3d9_yuv_bt601.h index ee889e1..88e14d5 100644 --- a/src/video-renderer/shader/d3d9/shader_d3d9_yuv_bt601.h +++ b/src/video-renderer/shader/d3d9/shader_d3d9_yuv_bt601.h @@ -28,7 +28,7 @@ dcl_2d s1 dcl_2d s2 -#line 54 "G:\video-renderer\video-renderer\src\video-renderer\shader\d3d9\d3d9_yuv_bt601.hlsl" +#line 54 "G:\git1\video-renderer\src\video-renderer\shader\d3d9\d3d9_yuv_bt601.hlsl" texld r0, t0, s0 texld r1, t0, s1 texld r2, t0, s2 @@ -55,225 +55,223 @@ const BYTE shader_d3d9_yuv_bt601[] = { 0, 2, 255, 255, 254, 255, - 184, 0, 68, 66, 85, 71, - 40, 0, 0, 0, 180, 2, + 182, 0, 68, 66, 85, 71, + 40, 0, 0, 0, 172, 2, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 124, 0, + 1, 0, 0, 0, 116, 0, 0, 0, 23, 0, 0, 0, - 128, 0, 0, 0, 4, 0, - 0, 0, 100, 2, 0, 0, - 116, 1, 0, 0, 71, 58, + 120, 0, 0, 0, 4, 0, + 0, 0, 92, 2, 0, 0, + 108, 1, 0, 0, 71, 58, + 92, 103, 105, 116, 49, 92, + 118, 105, 100, 101, 111, 45, + 114, 101, 110, 100, 101, 114, + 101, 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, - 114, 101, 114, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 114, 99, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 104, 97, 100, - 101, 114, 92, 100, 51, 100, - 57, 92, 100, 51, 100, 57, - 95, 121, 117, 118, 95, 98, - 116, 54, 48, 49, 46, 104, - 108, 115, 108, 0, 40, 0, + 114, 101, 114, 92, 115, 104, + 97, 100, 101, 114, 92, 100, + 51, 100, 57, 92, 100, 51, + 100, 57, 95, 121, 117, 118, + 95, 98, 116, 54, 48, 49, + 46, 104, 108, 115, 108, 0, + 171, 171, 40, 0, 0, 0, + 0, 0, 255, 255, 196, 3, 0, 0, 0, 0, 255, 255, - 204, 3, 0, 0, 0, 0, - 255, 255, 228, 3, 0, 0, - 0, 0, 255, 255, 252, 3, + 220, 3, 0, 0, 0, 0, + 255, 255, 244, 3, 0, 0, + 0, 0, 255, 255, 12, 4, 0, 0, 0, 0, 255, 255, - 20, 4, 0, 0, 0, 0, - 255, 255, 44, 4, 0, 0, - 0, 0, 255, 255, 56, 4, + 36, 4, 0, 0, 0, 0, + 255, 255, 48, 4, 0, 0, + 0, 0, 255, 255, 60, 4, 0, 0, 0, 0, 255, 255, - 68, 4, 0, 0, 0, 0, - 255, 255, 80, 4, 0, 0, - 54, 0, 0, 0, 92, 4, - 0, 0, 55, 0, 0, 0, - 108, 4, 0, 0, 56, 0, - 0, 0, 124, 4, 0, 0, - 54, 0, 0, 0, 140, 4, - 0, 0, 55, 0, 0, 0, - 152, 4, 0, 0, 56, 0, - 0, 0, 164, 4, 0, 0, - 58, 0, 0, 0, 176, 4, - 0, 0, 59, 0, 0, 0, - 192, 4, 0, 0, 60, 0, - 0, 0, 208, 4, 0, 0, - 61, 0, 0, 0, 224, 4, + 72, 4, 0, 0, 54, 0, + 0, 0, 84, 4, 0, 0, + 55, 0, 0, 0, 100, 4, + 0, 0, 56, 0, 0, 0, + 116, 4, 0, 0, 54, 0, + 0, 0, 132, 4, 0, 0, + 55, 0, 0, 0, 144, 4, + 0, 0, 56, 0, 0, 0, + 156, 4, 0, 0, 58, 0, + 0, 0, 168, 4, 0, 0, + 59, 0, 0, 0, 184, 4, + 0, 0, 60, 0, 0, 0, + 200, 4, 0, 0, 61, 0, + 0, 0, 216, 4, 0, 0, + 64, 0, 0, 0, 232, 4, 0, 0, 64, 0, 0, 0, - 240, 4, 0, 0, 64, 0, - 0, 0, 252, 4, 0, 0, - 64, 0, 0, 0, 8, 5, - 0, 0, 64, 0, 0, 0, - 20, 5, 0, 0, 44, 0, - 0, 0, 32, 5, 0, 0, - 79, 117, 116, 112, 117, 116, - 0, 171, 1, 0, 3, 0, - 1, 0, 4, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 15, 0, 0, 0, 0, 0, - 255, 255, 255, 255, 255, 255, - 16, 0, 0, 0, 255, 255, - 1, 0, 255, 255, 255, 255, - 17, 0, 0, 0, 255, 255, - 255, 255, 2, 0, 255, 255, - 109, 97, 105, 110, 0, 105, - 110, 112, 117, 116, 0, 112, - 111, 115, 0, 117, 118, 0, - 171, 171, 1, 0, 3, 0, - 1, 0, 2, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 99, 111, 108, 111, 114, 0, - 171, 171, 127, 1, 0, 0, - 64, 1, 0, 0, 131, 1, - 0, 0, 136, 1, 0, 0, - 152, 1, 0, 0, 64, 1, - 0, 0, 5, 0, 0, 0, - 1, 0, 10, 0, 1, 0, - 3, 0, 160, 1, 0, 0, - 4, 0, 0, 0, 4, 0, - 5, 0, 255, 255, 255, 255, + 244, 4, 0, 0, 64, 0, + 0, 0, 0, 5, 0, 0, + 64, 0, 0, 0, 12, 5, + 0, 0, 44, 0, 0, 0, + 24, 5, 0, 0, 79, 117, + 116, 112, 117, 116, 0, 171, 1, 0, 3, 0, 1, 0, 4, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 18, 0, + 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 255, 255, - 255, 255, 255, 255, 19, 0, + 255, 255, 255, 255, 16, 0, 0, 0, 255, 255, 1, 0, - 255, 255, 255, 255, 20, 0, + 255, 255, 255, 255, 17, 0, + 0, 0, 255, 255, 255, 255, + 2, 0, 255, 255, 109, 97, + 105, 110, 0, 105, 110, 112, + 117, 116, 0, 112, 111, 115, + 0, 117, 118, 0, 171, 171, + 1, 0, 3, 0, 1, 0, + 2, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 99, 111, + 108, 111, 114, 0, 171, 171, + 119, 1, 0, 0, 56, 1, + 0, 0, 123, 1, 0, 0, + 128, 1, 0, 0, 144, 1, + 0, 0, 56, 1, 0, 0, + 5, 0, 0, 0, 1, 0, + 10, 0, 1, 0, 3, 0, + 152, 1, 0, 0, 4, 0, + 0, 0, 4, 0, 5, 0, + 255, 255, 255, 255, 1, 0, + 3, 0, 1, 0, 4, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 18, 0, 0, 0, 0, 0, 255, 255, 255, 255, - 2, 0, 255, 255, 21, 0, + 255, 255, 19, 0, 0, 0, + 255, 255, 1, 0, 255, 255, + 255, 255, 20, 0, 0, 0, + 255, 255, 255, 255, 2, 0, + 255, 255, 21, 0, 0, 0, + 255, 255, 255, 255, 255, 255, + 3, 0, 22, 0, 0, 0, + 0, 0, 1, 0, 2, 0, + 3, 0, 121, 117, 118, 0, + 1, 0, 3, 0, 1, 0, + 3, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 11, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 255, 255, 12, 0, + 0, 0, 255, 255, 1, 0, + 255, 255, 255, 255, 13, 0, 0, 0, 255, 255, 255, 255, - 255, 255, 3, 0, 22, 0, + 2, 0, 255, 255, 14, 0, 0, 0, 0, 0, 1, 0, - 2, 0, 3, 0, 121, 117, - 118, 0, 1, 0, 3, 0, - 1, 0, 3, 0, 1, 0, + 2, 0, 255, 255, 0, 0, + 0, 0, 48, 1, 0, 0, + 56, 1, 0, 0, 3, 0, + 0, 0, 72, 1, 0, 0, + 108, 1, 0, 0, 113, 1, + 0, 0, 176, 1, 0, 0, + 1, 0, 0, 0, 192, 1, 0, 0, 0, 0, 0, 0, - 11, 0, 0, 0, 0, 0, - 255, 255, 255, 255, 255, 255, - 12, 0, 0, 0, 255, 255, - 1, 0, 255, 255, 255, 255, - 13, 0, 0, 0, 255, 255, - 255, 255, 2, 0, 255, 255, - 14, 0, 0, 0, 0, 0, - 1, 0, 2, 0, 255, 255, - 0, 0, 0, 0, 56, 1, - 0, 0, 64, 1, 0, 0, - 3, 0, 0, 0, 80, 1, - 0, 0, 116, 1, 0, 0, - 121, 1, 0, 0, 184, 1, - 0, 0, 1, 0, 0, 0, - 200, 1, 0, 0, 0, 0, - 0, 0, 116, 1, 0, 0, - 212, 1, 0, 0, 5, 0, - 0, 0, 228, 1, 0, 0, - 0, 0, 0, 0, 32, 2, - 0, 0, 36, 2, 0, 0, - 4, 0, 0, 0, 52, 2, - 0, 0, 77, 105, 99, 114, - 111, 115, 111, 102, 116, 32, - 40, 82, 41, 32, 72, 76, - 83, 76, 32, 83, 104, 97, - 100, 101, 114, 32, 67, 111, - 109, 112, 105, 108, 101, 114, - 32, 49, 48, 46, 49, 0, - 254, 255, 56, 0, 67, 84, - 65, 66, 28, 0, 0, 0, - 179, 0, 0, 0, 0, 2, - 255, 255, 3, 0, 0, 0, - 28, 0, 0, 0, 5, 1, - 0, 0, 172, 0, 0, 0, - 88, 0, 0, 0, 3, 0, - 1, 0, 1, 0, 0, 0, - 100, 0, 0, 0, 0, 0, - 0, 0, 116, 0, 0, 0, - 3, 0, 2, 0, 1, 0, - 0, 0, 128, 0, 0, 0, - 0, 0, 0, 0, 144, 0, - 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 156, 0, + 108, 1, 0, 0, 204, 1, + 0, 0, 5, 0, 0, 0, + 220, 1, 0, 0, 0, 0, + 0, 0, 24, 2, 0, 0, + 28, 2, 0, 0, 4, 0, + 0, 0, 44, 2, 0, 0, + 77, 105, 99, 114, 111, 115, + 111, 102, 116, 32, 40, 82, + 41, 32, 72, 76, 83, 76, + 32, 83, 104, 97, 100, 101, + 114, 32, 67, 111, 109, 112, + 105, 108, 101, 114, 32, 49, + 48, 46, 49, 0, 254, 255, + 56, 0, 67, 84, 65, 66, + 28, 0, 0, 0, 179, 0, + 0, 0, 0, 2, 255, 255, + 3, 0, 0, 0, 28, 0, + 0, 0, 5, 1, 0, 0, + 172, 0, 0, 0, 88, 0, + 0, 0, 3, 0, 1, 0, + 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, - 85, 83, 97, 109, 112, 108, - 101, 114, 0, 171, 171, 171, - 4, 0, 12, 0, 1, 0, - 1, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 86, 83, + 116, 0, 0, 0, 3, 0, + 2, 0, 1, 0, 0, 0, + 128, 0, 0, 0, 0, 0, + 0, 0, 144, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 156, 0, 0, 0, + 0, 0, 0, 0, 85, 83, 97, 109, 112, 108, 101, 114, 0, 171, 171, 171, 4, 0, 12, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 89, 83, 97, 109, + 0, 0, 86, 83, 97, 109, 112, 108, 101, 114, 0, 171, 171, 171, 4, 0, 12, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 112, 115, 95, 50, 95, 48, - 0, 77, 105, 99, 114, 111, - 115, 111, 102, 116, 32, 40, - 82, 41, 32, 72, 76, 83, - 76, 32, 83, 104, 97, 100, - 101, 114, 32, 67, 111, 109, - 112, 105, 108, 101, 114, 32, - 49, 48, 46, 49, 0, 171, - 81, 0, 0, 5, 0, 0, - 15, 160, 129, 128, 128, 189, - 129, 128, 0, 191, 129, 128, - 0, 191, 0, 0, 128, 63, - 81, 0, 0, 5, 1, 0, - 15, 160, 15, 11, 149, 63, - 0, 0, 0, 0, 186, 73, - 204, 63, 0, 0, 0, 0, - 81, 0, 0, 5, 2, 0, - 15, 160, 15, 11, 149, 63, - 2, 154, 200, 190, 197, 32, - 80, 191, 0, 0, 0, 0, - 81, 0, 0, 5, 3, 0, - 15, 160, 15, 11, 149, 63, - 206, 25, 1, 64, 0, 0, - 0, 0, 0, 0, 0, 0, - 31, 0, 0, 2, 0, 0, - 0, 128, 0, 0, 3, 176, - 31, 0, 0, 2, 0, 0, - 0, 144, 0, 8, 15, 160, - 31, 0, 0, 2, 0, 0, - 0, 144, 1, 8, 15, 160, - 31, 0, 0, 2, 0, 0, - 0, 144, 2, 8, 15, 160, - 66, 0, 0, 3, 0, 0, - 15, 128, 0, 0, 228, 176, - 0, 8, 228, 160, 66, 0, - 0, 3, 1, 0, 15, 128, - 0, 0, 228, 176, 1, 8, + 89, 83, 97, 109, 112, 108, + 101, 114, 0, 171, 171, 171, + 4, 0, 12, 0, 1, 0, + 1, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 112, 115, + 95, 50, 95, 48, 0, 77, + 105, 99, 114, 111, 115, 111, + 102, 116, 32, 40, 82, 41, + 32, 72, 76, 83, 76, 32, + 83, 104, 97, 100, 101, 114, + 32, 67, 111, 109, 112, 105, + 108, 101, 114, 32, 49, 48, + 46, 49, 0, 171, 81, 0, + 0, 5, 0, 0, 15, 160, + 129, 128, 128, 189, 129, 128, + 0, 191, 129, 128, 0, 191, + 0, 0, 128, 63, 81, 0, + 0, 5, 1, 0, 15, 160, + 15, 11, 149, 63, 0, 0, + 0, 0, 186, 73, 204, 63, + 0, 0, 0, 0, 81, 0, + 0, 5, 2, 0, 15, 160, + 15, 11, 149, 63, 2, 154, + 200, 190, 197, 32, 80, 191, + 0, 0, 0, 0, 81, 0, + 0, 5, 3, 0, 15, 160, + 15, 11, 149, 63, 206, 25, + 1, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 31, 0, + 0, 2, 0, 0, 0, 128, + 0, 0, 3, 176, 31, 0, + 0, 2, 0, 0, 0, 144, + 0, 8, 15, 160, 31, 0, + 0, 2, 0, 0, 0, 144, + 1, 8, 15, 160, 31, 0, + 0, 2, 0, 0, 0, 144, + 2, 8, 15, 160, 66, 0, + 0, 3, 0, 0, 15, 128, + 0, 0, 228, 176, 0, 8, 228, 160, 66, 0, 0, 3, - 2, 0, 15, 128, 0, 0, - 228, 176, 2, 8, 228, 160, - 1, 0, 0, 2, 0, 0, - 1, 128, 0, 0, 0, 128, - 1, 0, 0, 2, 0, 0, - 2, 128, 1, 0, 0, 128, - 1, 0, 0, 2, 0, 0, - 4, 128, 2, 0, 0, 128, - 2, 0, 0, 3, 0, 0, - 7, 128, 0, 0, 228, 128, - 0, 0, 228, 160, 8, 0, - 0, 3, 1, 0, 1, 128, - 0, 0, 228, 128, 1, 0, + 1, 0, 15, 128, 0, 0, + 228, 176, 1, 8, 228, 160, + 66, 0, 0, 3, 2, 0, + 15, 128, 0, 0, 228, 176, + 2, 8, 228, 160, 1, 0, + 0, 2, 0, 0, 1, 128, + 0, 0, 0, 128, 1, 0, + 0, 2, 0, 0, 2, 128, + 1, 0, 0, 128, 1, 0, + 0, 2, 0, 0, 4, 128, + 2, 0, 0, 128, 2, 0, + 0, 3, 0, 0, 7, 128, + 0, 0, 228, 128, 0, 0, 228, 160, 8, 0, 0, 3, - 1, 0, 2, 128, 0, 0, - 228, 128, 2, 0, 228, 160, + 1, 0, 1, 128, 0, 0, + 228, 128, 1, 0, 228, 160, 8, 0, 0, 3, 1, 0, - 4, 128, 0, 0, 228, 128, - 3, 0, 228, 160, 1, 0, - 0, 2, 1, 0, 1, 128, - 1, 0, 0, 128, 1, 0, - 0, 2, 1, 0, 2, 128, - 1, 0, 85, 128, 1, 0, - 0, 2, 1, 0, 4, 128, - 1, 0, 170, 128, 1, 0, - 0, 2, 1, 0, 8, 128, - 0, 0, 255, 160, 1, 0, - 0, 2, 0, 8, 15, 128, - 1, 0, 228, 128, 255, 255, - 0, 0 + 2, 128, 0, 0, 228, 128, + 2, 0, 228, 160, 8, 0, + 0, 3, 1, 0, 4, 128, + 0, 0, 228, 128, 3, 0, + 228, 160, 1, 0, 0, 2, + 1, 0, 1, 128, 1, 0, + 0, 128, 1, 0, 0, 2, + 1, 0, 2, 128, 1, 0, + 85, 128, 1, 0, 0, 2, + 1, 0, 4, 128, 1, 0, + 170, 128, 1, 0, 0, 2, + 1, 0, 8, 128, 0, 0, + 255, 160, 1, 0, 0, 2, + 0, 8, 15, 128, 1, 0, + 228, 128, 255, 255, 0, 0 }; diff --git a/src/video-renderer/shader/d3d9/shader_d3d9_yuv_bt709.h b/src/video-renderer/shader/d3d9/shader_d3d9_yuv_bt709.h index ad20929..a74db74 100644 --- a/src/video-renderer/shader/d3d9/shader_d3d9_yuv_bt709.h +++ b/src/video-renderer/shader/d3d9/shader_d3d9_yuv_bt709.h @@ -28,7 +28,7 @@ dcl_2d s1 dcl_2d s2 -#line 54 "G:\video-renderer\video-renderer\src\video-renderer\shader\d3d9\d3d9_yuv_bt709.hlsl" +#line 54 "G:\git1\video-renderer\src\video-renderer\shader\d3d9\d3d9_yuv_bt709.hlsl" texld r0, t0, s0 texld r1, t0, s1 texld r2, t0, s2 @@ -55,225 +55,223 @@ const BYTE shader_d3d9_yuv_bt709[] = { 0, 2, 255, 255, 254, 255, - 184, 0, 68, 66, 85, 71, - 40, 0, 0, 0, 180, 2, + 182, 0, 68, 66, 85, 71, + 40, 0, 0, 0, 172, 2, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 124, 0, + 1, 0, 0, 0, 116, 0, 0, 0, 23, 0, 0, 0, - 128, 0, 0, 0, 4, 0, - 0, 0, 100, 2, 0, 0, - 116, 1, 0, 0, 71, 58, + 120, 0, 0, 0, 4, 0, + 0, 0, 92, 2, 0, 0, + 108, 1, 0, 0, 71, 58, + 92, 103, 105, 116, 49, 92, + 118, 105, 100, 101, 111, 45, + 114, 101, 110, 100, 101, 114, + 101, 114, 92, 115, 114, 99, 92, 118, 105, 100, 101, 111, 45, 114, 101, 110, 100, 101, - 114, 101, 114, 92, 118, 105, - 100, 101, 111, 45, 114, 101, - 110, 100, 101, 114, 101, 114, - 92, 115, 114, 99, 92, 118, - 105, 100, 101, 111, 45, 114, - 101, 110, 100, 101, 114, 101, - 114, 92, 115, 104, 97, 100, - 101, 114, 92, 100, 51, 100, - 57, 92, 100, 51, 100, 57, - 95, 121, 117, 118, 95, 98, - 116, 55, 48, 57, 46, 104, - 108, 115, 108, 0, 40, 0, + 114, 101, 114, 92, 115, 104, + 97, 100, 101, 114, 92, 100, + 51, 100, 57, 92, 100, 51, + 100, 57, 95, 121, 117, 118, + 95, 98, 116, 55, 48, 57, + 46, 104, 108, 115, 108, 0, + 171, 171, 40, 0, 0, 0, + 0, 0, 255, 255, 196, 3, 0, 0, 0, 0, 255, 255, - 204, 3, 0, 0, 0, 0, - 255, 255, 228, 3, 0, 0, - 0, 0, 255, 255, 252, 3, + 220, 3, 0, 0, 0, 0, + 255, 255, 244, 3, 0, 0, + 0, 0, 255, 255, 12, 4, 0, 0, 0, 0, 255, 255, - 20, 4, 0, 0, 0, 0, - 255, 255, 44, 4, 0, 0, - 0, 0, 255, 255, 56, 4, + 36, 4, 0, 0, 0, 0, + 255, 255, 48, 4, 0, 0, + 0, 0, 255, 255, 60, 4, 0, 0, 0, 0, 255, 255, - 68, 4, 0, 0, 0, 0, - 255, 255, 80, 4, 0, 0, - 54, 0, 0, 0, 92, 4, - 0, 0, 55, 0, 0, 0, - 108, 4, 0, 0, 56, 0, - 0, 0, 124, 4, 0, 0, - 54, 0, 0, 0, 140, 4, - 0, 0, 55, 0, 0, 0, - 152, 4, 0, 0, 56, 0, - 0, 0, 164, 4, 0, 0, - 58, 0, 0, 0, 176, 4, - 0, 0, 59, 0, 0, 0, - 192, 4, 0, 0, 60, 0, - 0, 0, 208, 4, 0, 0, - 61, 0, 0, 0, 224, 4, + 72, 4, 0, 0, 54, 0, + 0, 0, 84, 4, 0, 0, + 55, 0, 0, 0, 100, 4, + 0, 0, 56, 0, 0, 0, + 116, 4, 0, 0, 54, 0, + 0, 0, 132, 4, 0, 0, + 55, 0, 0, 0, 144, 4, + 0, 0, 56, 0, 0, 0, + 156, 4, 0, 0, 58, 0, + 0, 0, 168, 4, 0, 0, + 59, 0, 0, 0, 184, 4, + 0, 0, 60, 0, 0, 0, + 200, 4, 0, 0, 61, 0, + 0, 0, 216, 4, 0, 0, + 64, 0, 0, 0, 232, 4, 0, 0, 64, 0, 0, 0, - 240, 4, 0, 0, 64, 0, - 0, 0, 252, 4, 0, 0, - 64, 0, 0, 0, 8, 5, - 0, 0, 64, 0, 0, 0, - 20, 5, 0, 0, 44, 0, - 0, 0, 32, 5, 0, 0, - 79, 117, 116, 112, 117, 116, - 0, 171, 1, 0, 3, 0, - 1, 0, 4, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 15, 0, 0, 0, 0, 0, - 255, 255, 255, 255, 255, 255, - 16, 0, 0, 0, 255, 255, - 1, 0, 255, 255, 255, 255, - 17, 0, 0, 0, 255, 255, - 255, 255, 2, 0, 255, 255, - 109, 97, 105, 110, 0, 105, - 110, 112, 117, 116, 0, 112, - 111, 115, 0, 117, 118, 0, - 171, 171, 1, 0, 3, 0, - 1, 0, 2, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 99, 111, 108, 111, 114, 0, - 171, 171, 127, 1, 0, 0, - 64, 1, 0, 0, 131, 1, - 0, 0, 136, 1, 0, 0, - 152, 1, 0, 0, 64, 1, - 0, 0, 5, 0, 0, 0, - 1, 0, 10, 0, 1, 0, - 3, 0, 160, 1, 0, 0, - 4, 0, 0, 0, 4, 0, - 5, 0, 255, 255, 255, 255, + 244, 4, 0, 0, 64, 0, + 0, 0, 0, 5, 0, 0, + 64, 0, 0, 0, 12, 5, + 0, 0, 44, 0, 0, 0, + 24, 5, 0, 0, 79, 117, + 116, 112, 117, 116, 0, 171, 1, 0, 3, 0, 1, 0, 4, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 18, 0, + 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 255, 255, - 255, 255, 255, 255, 19, 0, + 255, 255, 255, 255, 16, 0, 0, 0, 255, 255, 1, 0, - 255, 255, 255, 255, 20, 0, + 255, 255, 255, 255, 17, 0, + 0, 0, 255, 255, 255, 255, + 2, 0, 255, 255, 109, 97, + 105, 110, 0, 105, 110, 112, + 117, 116, 0, 112, 111, 115, + 0, 117, 118, 0, 171, 171, + 1, 0, 3, 0, 1, 0, + 2, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 99, 111, + 108, 111, 114, 0, 171, 171, + 119, 1, 0, 0, 56, 1, + 0, 0, 123, 1, 0, 0, + 128, 1, 0, 0, 144, 1, + 0, 0, 56, 1, 0, 0, + 5, 0, 0, 0, 1, 0, + 10, 0, 1, 0, 3, 0, + 152, 1, 0, 0, 4, 0, + 0, 0, 4, 0, 5, 0, + 255, 255, 255, 255, 1, 0, + 3, 0, 1, 0, 4, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 18, 0, 0, 0, 0, 0, 255, 255, 255, 255, - 2, 0, 255, 255, 21, 0, + 255, 255, 19, 0, 0, 0, + 255, 255, 1, 0, 255, 255, + 255, 255, 20, 0, 0, 0, + 255, 255, 255, 255, 2, 0, + 255, 255, 21, 0, 0, 0, + 255, 255, 255, 255, 255, 255, + 3, 0, 22, 0, 0, 0, + 0, 0, 1, 0, 2, 0, + 3, 0, 121, 117, 118, 0, + 1, 0, 3, 0, 1, 0, + 3, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 11, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 255, 255, 12, 0, + 0, 0, 255, 255, 1, 0, + 255, 255, 255, 255, 13, 0, 0, 0, 255, 255, 255, 255, - 255, 255, 3, 0, 22, 0, + 2, 0, 255, 255, 14, 0, 0, 0, 0, 0, 1, 0, - 2, 0, 3, 0, 121, 117, - 118, 0, 1, 0, 3, 0, - 1, 0, 3, 0, 1, 0, + 2, 0, 255, 255, 0, 0, + 0, 0, 48, 1, 0, 0, + 56, 1, 0, 0, 3, 0, + 0, 0, 72, 1, 0, 0, + 108, 1, 0, 0, 113, 1, + 0, 0, 176, 1, 0, 0, + 1, 0, 0, 0, 192, 1, 0, 0, 0, 0, 0, 0, - 11, 0, 0, 0, 0, 0, - 255, 255, 255, 255, 255, 255, - 12, 0, 0, 0, 255, 255, - 1, 0, 255, 255, 255, 255, - 13, 0, 0, 0, 255, 255, - 255, 255, 2, 0, 255, 255, - 14, 0, 0, 0, 0, 0, - 1, 0, 2, 0, 255, 255, - 0, 0, 0, 0, 56, 1, - 0, 0, 64, 1, 0, 0, - 3, 0, 0, 0, 80, 1, - 0, 0, 116, 1, 0, 0, - 121, 1, 0, 0, 184, 1, - 0, 0, 1, 0, 0, 0, - 200, 1, 0, 0, 0, 0, - 0, 0, 116, 1, 0, 0, - 212, 1, 0, 0, 5, 0, - 0, 0, 228, 1, 0, 0, - 0, 0, 0, 0, 32, 2, - 0, 0, 36, 2, 0, 0, - 4, 0, 0, 0, 52, 2, - 0, 0, 77, 105, 99, 114, - 111, 115, 111, 102, 116, 32, - 40, 82, 41, 32, 72, 76, - 83, 76, 32, 83, 104, 97, - 100, 101, 114, 32, 67, 111, - 109, 112, 105, 108, 101, 114, - 32, 49, 48, 46, 49, 0, - 254, 255, 56, 0, 67, 84, - 65, 66, 28, 0, 0, 0, - 179, 0, 0, 0, 0, 2, - 255, 255, 3, 0, 0, 0, - 28, 0, 0, 0, 5, 1, - 0, 0, 172, 0, 0, 0, - 88, 0, 0, 0, 3, 0, - 1, 0, 1, 0, 0, 0, - 100, 0, 0, 0, 0, 0, - 0, 0, 116, 0, 0, 0, - 3, 0, 2, 0, 1, 0, - 0, 0, 128, 0, 0, 0, - 0, 0, 0, 0, 144, 0, - 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 156, 0, + 108, 1, 0, 0, 204, 1, + 0, 0, 5, 0, 0, 0, + 220, 1, 0, 0, 0, 0, + 0, 0, 24, 2, 0, 0, + 28, 2, 0, 0, 4, 0, + 0, 0, 44, 2, 0, 0, + 77, 105, 99, 114, 111, 115, + 111, 102, 116, 32, 40, 82, + 41, 32, 72, 76, 83, 76, + 32, 83, 104, 97, 100, 101, + 114, 32, 67, 111, 109, 112, + 105, 108, 101, 114, 32, 49, + 48, 46, 49, 0, 254, 255, + 56, 0, 67, 84, 65, 66, + 28, 0, 0, 0, 179, 0, + 0, 0, 0, 2, 255, 255, + 3, 0, 0, 0, 28, 0, + 0, 0, 5, 1, 0, 0, + 172, 0, 0, 0, 88, 0, + 0, 0, 3, 0, 1, 0, + 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, - 85, 83, 97, 109, 112, 108, - 101, 114, 0, 171, 171, 171, - 4, 0, 12, 0, 1, 0, - 1, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 86, 83, + 116, 0, 0, 0, 3, 0, + 2, 0, 1, 0, 0, 0, + 128, 0, 0, 0, 0, 0, + 0, 0, 144, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 156, 0, 0, 0, + 0, 0, 0, 0, 85, 83, 97, 109, 112, 108, 101, 114, 0, 171, 171, 171, 4, 0, 12, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 89, 83, 97, 109, + 0, 0, 86, 83, 97, 109, 112, 108, 101, 114, 0, 171, 171, 171, 4, 0, 12, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 112, 115, 95, 50, 95, 48, - 0, 77, 105, 99, 114, 111, - 115, 111, 102, 116, 32, 40, - 82, 41, 32, 72, 76, 83, - 76, 32, 83, 104, 97, 100, - 101, 114, 32, 67, 111, 109, - 112, 105, 108, 101, 114, 32, - 49, 48, 46, 49, 0, 171, - 81, 0, 0, 5, 0, 0, - 15, 160, 129, 128, 128, 189, - 129, 128, 0, 191, 129, 128, - 0, 191, 0, 0, 128, 63, - 81, 0, 0, 5, 1, 0, - 15, 160, 15, 11, 149, 63, - 0, 0, 0, 0, 50, 119, - 229, 63, 0, 0, 0, 0, - 81, 0, 0, 5, 2, 0, - 15, 160, 15, 11, 149, 63, - 26, 81, 90, 190, 34, 108, - 8, 191, 0, 0, 0, 0, - 81, 0, 0, 5, 3, 0, - 15, 160, 15, 11, 149, 63, - 144, 49, 7, 64, 0, 0, - 0, 0, 0, 0, 0, 0, - 31, 0, 0, 2, 0, 0, - 0, 128, 0, 0, 3, 176, - 31, 0, 0, 2, 0, 0, - 0, 144, 0, 8, 15, 160, - 31, 0, 0, 2, 0, 0, - 0, 144, 1, 8, 15, 160, - 31, 0, 0, 2, 0, 0, - 0, 144, 2, 8, 15, 160, - 66, 0, 0, 3, 0, 0, - 15, 128, 0, 0, 228, 176, - 0, 8, 228, 160, 66, 0, - 0, 3, 1, 0, 15, 128, - 0, 0, 228, 176, 1, 8, + 89, 83, 97, 109, 112, 108, + 101, 114, 0, 171, 171, 171, + 4, 0, 12, 0, 1, 0, + 1, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 112, 115, + 95, 50, 95, 48, 0, 77, + 105, 99, 114, 111, 115, 111, + 102, 116, 32, 40, 82, 41, + 32, 72, 76, 83, 76, 32, + 83, 104, 97, 100, 101, 114, + 32, 67, 111, 109, 112, 105, + 108, 101, 114, 32, 49, 48, + 46, 49, 0, 171, 81, 0, + 0, 5, 0, 0, 15, 160, + 129, 128, 128, 189, 129, 128, + 0, 191, 129, 128, 0, 191, + 0, 0, 128, 63, 81, 0, + 0, 5, 1, 0, 15, 160, + 15, 11, 149, 63, 0, 0, + 0, 0, 50, 119, 229, 63, + 0, 0, 0, 0, 81, 0, + 0, 5, 2, 0, 15, 160, + 15, 11, 149, 63, 26, 81, + 90, 190, 34, 108, 8, 191, + 0, 0, 0, 0, 81, 0, + 0, 5, 3, 0, 15, 160, + 15, 11, 149, 63, 144, 49, + 7, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 31, 0, + 0, 2, 0, 0, 0, 128, + 0, 0, 3, 176, 31, 0, + 0, 2, 0, 0, 0, 144, + 0, 8, 15, 160, 31, 0, + 0, 2, 0, 0, 0, 144, + 1, 8, 15, 160, 31, 0, + 0, 2, 0, 0, 0, 144, + 2, 8, 15, 160, 66, 0, + 0, 3, 0, 0, 15, 128, + 0, 0, 228, 176, 0, 8, 228, 160, 66, 0, 0, 3, - 2, 0, 15, 128, 0, 0, - 228, 176, 2, 8, 228, 160, - 1, 0, 0, 2, 0, 0, - 1, 128, 0, 0, 0, 128, - 1, 0, 0, 2, 0, 0, - 2, 128, 1, 0, 0, 128, - 1, 0, 0, 2, 0, 0, - 4, 128, 2, 0, 0, 128, - 2, 0, 0, 3, 0, 0, - 7, 128, 0, 0, 228, 128, - 0, 0, 228, 160, 8, 0, - 0, 3, 1, 0, 1, 128, - 0, 0, 228, 128, 1, 0, + 1, 0, 15, 128, 0, 0, + 228, 176, 1, 8, 228, 160, + 66, 0, 0, 3, 2, 0, + 15, 128, 0, 0, 228, 176, + 2, 8, 228, 160, 1, 0, + 0, 2, 0, 0, 1, 128, + 0, 0, 0, 128, 1, 0, + 0, 2, 0, 0, 2, 128, + 1, 0, 0, 128, 1, 0, + 0, 2, 0, 0, 4, 128, + 2, 0, 0, 128, 2, 0, + 0, 3, 0, 0, 7, 128, + 0, 0, 228, 128, 0, 0, 228, 160, 8, 0, 0, 3, - 1, 0, 2, 128, 0, 0, - 228, 128, 2, 0, 228, 160, + 1, 0, 1, 128, 0, 0, + 228, 128, 1, 0, 228, 160, 8, 0, 0, 3, 1, 0, - 4, 128, 0, 0, 228, 128, - 3, 0, 228, 160, 1, 0, - 0, 2, 1, 0, 1, 128, - 1, 0, 0, 128, 1, 0, - 0, 2, 1, 0, 2, 128, - 1, 0, 85, 128, 1, 0, - 0, 2, 1, 0, 4, 128, - 1, 0, 170, 128, 1, 0, - 0, 2, 1, 0, 8, 128, - 0, 0, 255, 160, 1, 0, - 0, 2, 0, 8, 15, 128, - 1, 0, 228, 128, 255, 255, - 0, 0 + 2, 128, 0, 0, 228, 128, + 2, 0, 228, 160, 8, 0, + 0, 3, 1, 0, 4, 128, + 0, 0, 228, 128, 3, 0, + 228, 160, 1, 0, 0, 2, + 1, 0, 1, 128, 1, 0, + 0, 128, 1, 0, 0, 2, + 1, 0, 2, 128, 1, 0, + 85, 128, 1, 0, 0, 2, + 1, 0, 4, 128, 1, 0, + 170, 128, 1, 0, 0, 2, + 1, 0, 8, 128, 0, 0, + 255, 160, 1, 0, 0, 2, + 0, 8, 15, 128, 1, 0, + 228, 128, 255, 255, 0, 0 }; diff --git a/src/video-renderer/shader_yuv_bt601.h b/src/video-renderer/shader_yuv_bt601.h new file mode 100644 index 0000000..b53dd63 --- /dev/null +++ b/src/video-renderer/shader_yuv_bt601.h @@ -0,0 +1,238 @@ +#if 0 +// +// Generated by Microsoft (R) HLSL Shader Compiler 10.1 +// +// +// Resource Bindings: +// +// Name Type Format Dim HLSL Bind Count +// ------------------------------ ---------- ------- ----------- -------------- ------ +// theSampler sampler NA NA s0 1 +// theTextureY texture float4 2d t0 1 +// theTextureU texture float4 2d t1 1 +// theTextureV texture float4 2d t2 1 +// +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_POSITION 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// COLOR 0 xyzw 2 NONE float xyzw +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_TARGET 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_resource_texture2d (float,float,float,float) t1 +dcl_resource_texture2d (float,float,float,float) t2 +dcl_input_ps linear v1.xy +dcl_input_ps linear v2.xyzw +dcl_output o0.xyzw +dcl_temps 2 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +sample r1.xyzw, v1.xyxx, t1.xyzw, s0 +mov r0.y, r1.x +sample r1.xyzw, v1.xyxx, t2.xyzw, s0 +mov r0.z, r1.x +add r0.xyz, r0.xyzx, l(-0.062745, -0.501961, -0.501961, 0.000000) +dp2 r1.x, r0.xzxx, l(1.164400, 1.596000, 0.000000, 0.000000) +dp3 r1.y, r0.xyzx, l(1.164400, -0.391800, -0.813000, 0.000000) +dp2 r1.z, r0.xyxx, l(1.164400, 2.017200, 0.000000, 0.000000) +mov r1.w, l(1.000000) +mul o0.xyzw, r1.xyzw, v2.xyzw +ret +// Approximately 12 instruction slots used +#endif + +const BYTE shader_yuv_bt601[] = +{ + 68, 88, 66, 67, 66, 47, + 121, 231, 30, 151, 253, 213, + 127, 222, 130, 124, 174, 185, + 225, 186, 1, 0, 0, 0, + 52, 4, 0, 0, 5, 0, + 0, 0, 52, 0, 0, 0, + 48, 1, 0, 0, 164, 1, + 0, 0, 216, 1, 0, 0, + 184, 3, 0, 0, 82, 68, + 69, 70, 244, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 4, 0, 0, 0, + 28, 0, 0, 0, 0, 4, + 255, 255, 0, 1, 0, 0, + 203, 0, 0, 0, 156, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 167, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 4, 0, 0, 0, 255, 255, + 255, 255, 0, 0, 0, 0, + 1, 0, 0, 0, 13, 0, + 0, 0, 179, 0, 0, 0, + 2, 0, 0, 0, 5, 0, + 0, 0, 4, 0, 0, 0, + 255, 255, 255, 255, 1, 0, + 0, 0, 1, 0, 0, 0, + 13, 0, 0, 0, 191, 0, + 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 4, 0, + 0, 0, 255, 255, 255, 255, + 2, 0, 0, 0, 1, 0, + 0, 0, 13, 0, 0, 0, + 116, 104, 101, 83, 97, 109, + 112, 108, 101, 114, 0, 116, + 104, 101, 84, 101, 120, 116, + 117, 114, 101, 89, 0, 116, + 104, 101, 84, 101, 120, 116, + 117, 114, 101, 85, 0, 116, + 104, 101, 84, 101, 120, 116, + 117, 114, 101, 86, 0, 77, + 105, 99, 114, 111, 115, 111, + 102, 116, 32, 40, 82, 41, + 32, 72, 76, 83, 76, 32, + 83, 104, 97, 100, 101, 114, + 32, 67, 111, 109, 112, 105, + 108, 101, 114, 32, 49, 48, + 46, 49, 0, 171, 73, 83, + 71, 78, 108, 0, 0, 0, + 3, 0, 0, 0, 8, 0, + 0, 0, 80, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 92, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 3, 3, + 0, 0, 101, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 15, 15, + 0, 0, 83, 86, 95, 80, + 79, 83, 73, 84, 73, 79, + 78, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 67, + 79, 76, 79, 82, 0, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 65, 82, 71, 69, + 84, 0, 171, 171, 83, 72, + 68, 82, 216, 1, 0, 0, + 64, 0, 0, 0, 118, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 1, 0, 0, 0, + 85, 85, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, + 2, 0, 0, 0, 85, 85, + 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, + 0, 0, 98, 16, 0, 3, + 242, 16, 16, 0, 2, 0, + 0, 0, 101, 0, 0, 3, + 242, 32, 16, 0, 0, 0, + 0, 0, 104, 0, 0, 2, + 2, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, + 1, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 1, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 54, 0, + 0, 5, 34, 0, 16, 0, + 0, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 1, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 2, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 66, 0, + 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 1, 0, + 0, 0, 0, 0, 0, 10, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 129, 128, 128, 189, + 129, 128, 0, 191, 129, 128, + 0, 191, 0, 0, 0, 0, + 15, 0, 0, 10, 18, 0, + 16, 0, 1, 0, 0, 0, + 134, 0, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 15, 11, 149, 63, 186, 73, + 204, 63, 0, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 10, 34, 0, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 15, 11, + 149, 63, 2, 154, 200, 190, + 197, 32, 80, 191, 0, 0, + 0, 0, 15, 0, 0, 10, + 66, 0, 16, 0, 1, 0, + 0, 0, 70, 0, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 15, 11, 149, 63, + 206, 25, 1, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 0, + 16, 0, 1, 0, 0, 0, + 1, 64, 0, 0, 0, 0, + 128, 63, 56, 0, 0, 7, + 242, 32, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 1, 0, 0, 0, 70, 30, + 16, 0, 2, 0, 0, 0, + 62, 0, 0, 1, 83, 84, + 65, 84, 116, 0, 0, 0, + 12, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 5, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0 +}; diff --git a/src/video-renderer/shader_yuv_bt709.h b/src/video-renderer/shader_yuv_bt709.h new file mode 100644 index 0000000..0d38d31 --- /dev/null +++ b/src/video-renderer/shader_yuv_bt709.h @@ -0,0 +1,229 @@ +#if 0 +// +// Generated by Microsoft (R) HLSL Shader Compiler 10.1 +// +// +// Resource Bindings: +// +// Name Type Format Dim HLSL Bind Count +// ------------------------------ ---------- ------- ----------- -------------- ------ +// theSampler sampler NA NA s0 1 +// theTextureY texture float4 2d t0 1 +// theTextureU texture float4 2d t1 1 +// theTextureV texture float4 2d t2 1 +// +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_POSITION 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// COLOR 0 xyzw 2 NONE float +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_TARGET 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_resource_texture2d (float,float,float,float) t1 +dcl_resource_texture2d (float,float,float,float) t2 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +sample r1.xyzw, v1.xyxx, t1.xyzw, s0 +mov r0.y, r1.x +sample r1.xyzw, v1.xyxx, t2.xyzw, s0 +mov r0.z, r1.x +add r0.xyz, r0.xyzx, l(-0.062745, -0.501961, -0.501961, 0.000000) +dp2 o0.x, r0.xzxx, l(1.164400, 1.792700, 0.000000, 0.000000) +dp3 o0.y, r0.xyzx, l(1.164400, -0.213200, -0.532900, 0.000000) +dp2 o0.z, r0.xyxx, l(1.164400, 2.112400, 0.000000, 0.000000) +mov o0.w, l(1.000000) +ret +// Approximately 11 instruction slots used +#endif + +const BYTE shader_yuv_bt709[] = +{ + 68, 88, 66, 67, 38, 155, + 204, 159, 102, 17, 204, 22, + 162, 177, 46, 102, 42, 33, + 53, 227, 1, 0, 0, 0, + 12, 4, 0, 0, 5, 0, + 0, 0, 52, 0, 0, 0, + 48, 1, 0, 0, 164, 1, + 0, 0, 216, 1, 0, 0, + 144, 3, 0, 0, 82, 68, + 69, 70, 244, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 4, 0, 0, 0, + 28, 0, 0, 0, 0, 4, + 255, 255, 0, 1, 0, 0, + 203, 0, 0, 0, 156, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 167, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 4, 0, 0, 0, 255, 255, + 255, 255, 0, 0, 0, 0, + 1, 0, 0, 0, 13, 0, + 0, 0, 179, 0, 0, 0, + 2, 0, 0, 0, 5, 0, + 0, 0, 4, 0, 0, 0, + 255, 255, 255, 255, 1, 0, + 0, 0, 1, 0, 0, 0, + 13, 0, 0, 0, 191, 0, + 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 4, 0, + 0, 0, 255, 255, 255, 255, + 2, 0, 0, 0, 1, 0, + 0, 0, 13, 0, 0, 0, + 116, 104, 101, 83, 97, 109, + 112, 108, 101, 114, 0, 116, + 104, 101, 84, 101, 120, 116, + 117, 114, 101, 89, 0, 116, + 104, 101, 84, 101, 120, 116, + 117, 114, 101, 85, 0, 116, + 104, 101, 84, 101, 120, 116, + 117, 114, 101, 86, 0, 77, + 105, 99, 114, 111, 115, 111, + 102, 116, 32, 40, 82, 41, + 32, 72, 76, 83, 76, 32, + 83, 104, 97, 100, 101, 114, + 32, 67, 111, 109, 112, 105, + 108, 101, 114, 32, 49, 48, + 46, 49, 0, 171, 73, 83, + 71, 78, 108, 0, 0, 0, + 3, 0, 0, 0, 8, 0, + 0, 0, 80, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 92, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 3, 3, + 0, 0, 101, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 80, + 79, 83, 73, 84, 73, 79, + 78, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 67, + 79, 76, 79, 82, 0, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 65, 82, 71, 69, + 84, 0, 171, 171, 83, 72, + 68, 82, 176, 1, 0, 0, + 64, 0, 0, 0, 108, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 1, 0, 0, 0, + 85, 85, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, + 2, 0, 0, 0, 85, 85, + 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, + 0, 0, 101, 0, 0, 3, + 242, 32, 16, 0, 0, 0, + 0, 0, 104, 0, 0, 2, + 2, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, + 1, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 1, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 54, 0, + 0, 5, 34, 0, 16, 0, + 0, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 1, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 2, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 66, 0, + 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 1, 0, + 0, 0, 0, 0, 0, 10, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 129, 128, 128, 189, + 129, 128, 0, 191, 129, 128, + 0, 191, 0, 0, 0, 0, + 15, 0, 0, 10, 18, 32, + 16, 0, 0, 0, 0, 0, + 134, 0, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 15, 11, 149, 63, 50, 119, + 229, 63, 0, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 10, 34, 32, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 15, 11, + 149, 63, 26, 81, 90, 190, + 34, 108, 8, 191, 0, 0, + 0, 0, 15, 0, 0, 10, + 66, 32, 16, 0, 0, 0, + 0, 0, 70, 0, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 15, 11, 149, 63, + 144, 49, 7, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 0, 0, + 128, 63, 62, 0, 0, 1, + 83, 84, 65, 84, 116, 0, + 0, 0, 11, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, + 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0 +};