This commit is contained in:
Fujiwara 2024-09-28 09:00:47 +03:00
parent 525b0a44a7
commit d2ff88c788
3 changed files with 4 additions and 1267 deletions

View File

@ -28,11 +28,11 @@ Size=322,102
[Window][##NOTIFY0] [Window][##NOTIFY0]
Pos=15,15 Pos=15,15
Size=362,79 Size=396,79
[Window][##NOTIFY1] [Window][##NOTIFY1]
Pos=15,105 Pos=15,105
Size=362,79 Size=396,79
[Window][##NOTIFY2] [Window][##NOTIFY2]
Pos=15,195 Pos=15,195

View File

@ -625,8 +625,7 @@ int main(int, char**)
//Byte //Byte
D3DX11_IMAGE_LOAD_INFO info; ID3DX11ThreadPump* pump{ nullptr }; D3DX11_IMAGE_LOAD_INFO info; ID3DX11ThreadPump* pump{ nullptr };
if (texture::logo == nullptr)
D3DX11CreateShaderResourceViewFromMemory(g_pd3dDevice, logo_type, sizeof(logo_type), &info, pump, &texture::logo, 0);
if (texture::foto == nullptr) if (texture::foto == nullptr)
D3DX11CreateShaderResourceViewFromMemory(g_pd3dDevice, foto_type, sizeof(foto_type), &info, pump, &texture::foto, 0); D3DX11CreateShaderResourceViewFromMemory(g_pd3dDevice, foto_type, sizeof(foto_type), &info, pump, &texture::foto, 0);

File diff suppressed because it is too large Load Diff