ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glide64] Get ext_ghq_init to have texture dir is char *

This commit is contained in:
zilmar 2016-02-01 17:01:11 +11:00
parent 71710be0b8
commit ee51201eae
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Glide64/Ext_TxFilter.cpp
View File

@ -25,7 +25,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "Ext_TxFilter.h" #include "Ext_TxFilter.h"
extern "C" boolean txfilter_init(int maxwidth, int maxheight, int maxbpp, int options, int cachesize, const wchar_t *path, const char *ident, dispInfoFuncExt callback); extern "C" boolean txfilter_init(int maxwidth, int maxheight, int maxbpp, int options, int cachesize, const char *path, const char *ident, dispInfoFuncExt callback);
extern "C" void txfilter_shutdown(void); extern "C" void txfilter_shutdown(void);
extern "C" boolean txfilter(unsigned char *src, int srcwidth, int srcheight, unsigned short srcformat, uint64 g64crc, GHQTexInfo *info); extern "C" boolean txfilter(unsigned char *src, int srcwidth, int srcheight, unsigned short srcformat, uint64 g64crc, GHQTexInfo *info);
extern "C" boolean txfilter_hirestex(uint64 g64crc, uint64 r_crc64, unsigned short *palette, GHQTexInfo *info); extern "C" boolean txfilter_hirestex(uint64 g64crc, uint64 r_crc64, unsigned short *palette, GHQTexInfo *info);
@ -39,8 +39,7 @@ void ext_ghq_shutdown(void)
} }
boolean ext_ghq_init(int maxwidth, int maxheight, int maxbpp, int options, int cachesize, boolean ext_ghq_init(int maxwidth, int maxheight, int maxbpp, int options, int cachesize,
const wchar_t *path, const char *ident, const char *path, const char *ident, dispInfoFuncExt callback)
dispInfoFuncExt callback)
{ {
return txfilter_init(maxwidth, maxheight, maxbpp, options, cachesize, path, ident, callback); return txfilter_init(maxwidth, maxheight, maxbpp, options, cachesize, path, ident, callback);
} }

2
Source/Glide64/Ext_TxFilter.h
View File

@ -168,7 +168,7 @@ boolean ext_ghq_init(int maxwidth, /* maximum texture width supported by hardwar
int maxbpp, /* maximum texture bpp supported by hardware */ int maxbpp, /* maximum texture bpp supported by hardware */
int options, /* options */ int options, /* options */
int cachesize,/* cache textures to system memory */ int cachesize,/* cache textures to system memory */
const wchar_t *path, /* plugin directory. must be smaller than MAX_PATH */ const char *path, /* plugin directory. must be smaller than MAX_PATH */
const char *ident, /* name of ROM. must be no longer than 64 in character. */ const char *ident, /* name of ROM. must be no longer than 64 in character. */
dispInfoFuncExt callback /* callback function to display info */ dispInfoFuncExt callback /* callback function to display info */
); );

2
Source/Glide64/Main.cpp
View File

@ -1083,7 +1083,7 @@ int InitGfx()
voodoo.sup_32bit_tex ? 32 : 16, // max texture bpp supported by hardware voodoo.sup_32bit_tex ? 32 : 16, // max texture bpp supported by hardware
options, options,
settings.ghq_cache_size * 1024 * 1024, // cache texture to system memory settings.ghq_cache_size * 1024 * 1024, // cache texture to system memory
stdstr(settings.texture_dir).ToUTF16().c_str(), settings.texture_dir.c_str(),
rdp.RomName, // name of ROM. must be no longer than 256 characters rdp.RomName, // name of ROM. must be no longer than 256 characters
DisplayLoadProgress); DisplayLoadProgress);
} }