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

GregMiscellaneous: zzogl-pg: 

* Properly fix the 'missing external linkage' thanks to Gigaherz.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3773 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2010-09-15 21:26:59 +00:00
parent bed38e12a0
commit a51455656a
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/zzogl-pg/opengl/GS.h
View File

@ -542,7 +542,9 @@ typedef struct
extern GSinternal gs; extern GSinternal gs;
static __forceinline u16 RGBA32to16(u32 c) // Note the function is used in a template parameter so it must be declared extern
// Note2: In this case extern is not compatible with __forceinline so just inline it...
extern inline u16 RGBA32to16(u32 c)
{ {
return (u16)((((c) & 0x000000f8) >> 3) | return (u16)((((c) & 0x000000f8) >> 3) |
(((c) & 0x0000f800) >> 6) | (((c) & 0x0000f800) >> 6) |

8
plugins/zzogl-pg/opengl/targets.cpp
View File

@ -2928,14 +2928,6 @@ void FlushTransferRanges(const tex0Info* ptex)
template <typename T, typename Tret> template <typename T, typename Tret>
inline Tret dummy_return(T value) { return value; } inline Tret dummy_return(T value) { return value; }
inline u16 RGBA32to16(u32 c)
{
return (u16)((((c) & 0x000000f8) >> 3) |
(((c) & 0x0000f800) >> 6) |
(((c) & 0x00f80000) >> 9) |
(((c) & 0x80000000) >> 16));
}
template <typename T, typename Tsrc, T (*convfn)(Tsrc)> template <typename T, typename Tsrc, T (*convfn)(Tsrc)>
inline void Resolve_32_Bit(const void* psrc, int fbp, int fbw, int fbh, const int psm, u32 fbm) inline void Resolve_32_Bit(const void* psrc, int fbp, int fbw, int fbh, const int psm, u32 fbm)
{ {