lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 25.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-03-25 09:07:22 +01:00
parent 04fe0efc67
commit 8b2e5f2130
569 changed files with 62491 additions and 5875 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libobs-d3d11/d3d11-texture2d.cpp
View file

@ -27,7 +27,7 @@ void gs_texture_2d::InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd)
size_t curTex = 0;
if (!actual_levels)
actual_levels = gs_get_total_levels(width, height);
actual_levels = gs_get_total_levels(width, height, 1);
rowSizeBytes /= 8;
@ -48,7 +48,7 @@ void gs_texture_2d::InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd)
}
}
void gs_texture_2d::BackupTexture(const uint8_t **data)
void gs_texture_2d::BackupTexture(const uint8_t *const *data)
{
this->data.resize(levels);
@ -66,8 +66,10 @@ void gs_texture_2d::BackupTexture(const uint8_t **data)
vector<uint8_t> &subData = this->data[i];
memcpy(&subData[0], data[i], texSize);
w /= 2;
h /= 2;
if (w > 1)
w /= 2;
if (h > 1)
h /= 2;
}
}
@ -87,7 +89,7 @@ void gs_texture_2d::GetSharedHandle(IDXGIResource *dxgi_res)
}
}
void gs_texture_2d::InitTexture(const uint8_t **data)
void gs_texture_2d::InitTexture(const uint8_t *const *data)
{
HRESULT hr;
@ -226,7 +228,7 @@ void gs_texture_2d::InitRenderTargets()
gs_texture_2d::gs_texture_2d(gs_device_t *device, uint32_t width,
uint32_t height, gs_color_format colorFormat,
uint32_t levels, const uint8_t **data,
uint32_t levels, const uint8_t *const *data,
uint32_t flags_, gs_texture_type type,
bool gdiCompatible, bool nv12_)
: gs_texture(device, gs_type::gs_texture_2d, type, levels, colorFormat),