mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-14 18:19:36 +01:00
Delete some left behind unused code
This commit is contained in:
1 parent
524854ac16
commit
5df4bac6d2
17 files changed
+17
-127
No files matched your search
@@ -89,7 +89,7 @@ LPDIRECT3DTEXTURE9 DepalShaderCacheDX9::GetClutTexture(GEPaletteFormat clutForma
|
||||
usage = D3DUSAGE_DYNAMIC; // TODO: Switch to using a staging texture?
|
||||
}
|
||||
|
||||
HRESULT hr = pD3Ddevice->CreateTexture(texturePixels, 1, 1, usage, (D3DFORMAT)D3DFMT(dstFmt), pool, &tex->texture, NULL);
|
||||
HRESULT hr = pD3Ddevice->CreateTexture(texturePixels, 1, 1, usage, dstFmt, pool, &tex->texture, NULL);
|
||||
if (FAILED(hr)) {
|
||||
ERROR_LOG(G3D, "Failed to create D3D texture for depal");
|
||||
delete tex;
|
||||
|
||||
@@ -125,7 +125,7 @@ namespace DX9 {
|
||||
pool = D3DPOOL_DEFAULT;
|
||||
usage = D3DUSAGE_DYNAMIC;
|
||||
}
|
||||
HRESULT hr = pD3Ddevice->CreateTexture(width, height, 1, usage, D3DFMT(D3DFMT_A8R8G8B8), pool, &drawPixelsTex_, NULL);
|
||||
HRESULT hr = pD3Ddevice->CreateTexture(width, height, 1, usage, D3DFMT_A8R8G8B8, pool, &drawPixelsTex_, NULL);
|
||||
if (FAILED(hr)) {
|
||||
drawPixelsTex_ = nullptr;
|
||||
ERROR_LOG(G3D, "Failed to create drawpixels texture");
|
||||
|
||||
@@ -1340,7 +1340,7 @@ ReplacedTextureFormat FromD3D9Format(u32 fmt) {
|
||||
}
|
||||
}
|
||||
|
||||
u32 ToD3D9Format(ReplacedTextureFormat fmt) {
|
||||
D3DFORMAT ToD3D9Format(ReplacedTextureFormat fmt) {
|
||||
switch (fmt) {
|
||||
case ReplacedTextureFormat::F_5650:
|
||||
return D3DFMT_R5G6B5;
|
||||
@@ -1369,9 +1369,9 @@ void TextureCacheDX9::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &re
|
||||
}
|
||||
int levels = scaleFactor == 1 ? maxLevel + 1 : 1;
|
||||
int tw = w, th = h;
|
||||
D3DFORMAT tfmt = (D3DFORMAT)D3DFMT(dstFmt);
|
||||
D3DFORMAT tfmt = (D3DFORMAT)(dstFmt);
|
||||
if (replaced.GetSize(level, tw, th)) {
|
||||
tfmt = (D3DFORMAT)D3DFMT(ToD3D9Format(replaced.Format(level)));
|
||||
tfmt = ToD3D9Format(replaced.Format(level));
|
||||
} else {
|
||||
tw *= scaleFactor;
|
||||
th *= scaleFactor;
|
||||
|
||||
@@ -219,10 +219,6 @@ void DirectxInit(HWND window) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
#ifdef _XBOX
|
||||
pD3Ddevice->SetRingBufferParameters( &d3dr );
|
||||
#endif
|
||||
|
||||
std::string errorMessage;
|
||||
CompileShaders(errorMessage);
|
||||
|
||||
|
||||
@@ -1,13 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "Common/CommonWindows.h"
|
||||
#ifdef _XBOX
|
||||
// Used on XBox to create a linear format
|
||||
// TODO: Might actually want to use nonlinear on xbox?
|
||||
#define D3DFMT(x) (D3DFORMAT)MAKELINFMT(x)
|
||||
#else
|
||||
#define D3DFMT(x) x
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
#include <d3d9.h>
|
||||
|
||||
Reference in new issue
Block a user