aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-09-23 13:10:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #825 Remove all warning when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-10-30 17:47:47 +02:00
parent 69a9119603
commit 14014cd35a
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/misc/config_file.h
View file

@ -124,7 +124,7 @@ public:
{ {
public: public:
CVar () : Type(T_UNKNOWN), Root(false), FromLocalFile(true), SaveWrap(6) {} CVar () : Type(T_UNKNOWN), Root(false), Comp(false), FromLocalFile(true), SaveWrap(6) {}
/// \name Access to the variable content. /// \name Access to the variable content.
//@{ //@{

38
code/nel/src/3d/driver/opengl/driver_opengl.cpp
View file

@ -183,7 +183,7 @@ CDriverGL::CDriverGL()
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
_ctx = nil; _ctx = nil;
_glView = nil; _glView = nil;
_backBufferHeight = 0; _backBufferHeight = 0;
@ -1672,12 +1672,12 @@ ATTRIB bump0TexCoord = fragment.texcoord[0]; \n\
ATTRIB bump1TexCoord = fragment.texcoord[1]; \n\ ATTRIB bump1TexCoord = fragment.texcoord[1]; \n\
ATTRIB envMapTexCoord = fragment.texcoord[2]; \n\ ATTRIB envMapTexCoord = fragment.texcoord[2]; \n\
OUTPUT oCol = result.color; \n\ OUTPUT oCol = result.color; \n\
TEMP bmValue; \n\ TEMP bmValue; \n\
#read bump map 0 \n\ #read bump map 0 \n\
TEX bmValue, bump0TexCoord, texture[0], 2D; \n\ TEX bmValue, bump0TexCoord, texture[0], 2D; \n\
#bias result (include scaling) \n\ #bias result (include scaling) \n\
MAD bmValue, bmValue, bump0ScaleBias.xxxx, bump0ScaleBias.yyzz; \n\ MAD bmValue, bmValue, bump0ScaleBias.xxxx, bump0ScaleBias.yyzz; \n\
ADD bmValue, bmValue, bump1TexCoord; \n\ ADD bmValue, bmValue, bump1TexCoord; \n\
#read bump map 1 \n\ #read bump map 1 \n\
TEX bmValue, bmValue, texture[1], 2D; \n\ TEX bmValue, bmValue, texture[1], 2D; \n\
#bias result (include scaling) \n\ #bias result (include scaling) \n\
@ -1700,14 +1700,14 @@ ATTRIB bump1TexCoord = fragment.texcoord[1]; \n\
ATTRIB envMapTexCoord = fragment.texcoord[2]; \n\ ATTRIB envMapTexCoord = fragment.texcoord[2]; \n\
ATTRIB fogValue = fragment.fogcoord; \n\ ATTRIB fogValue = fragment.fogcoord; \n\
OUTPUT oCol = result.color; \n\ OUTPUT oCol = result.color; \n\
TEMP bmValue; \n\ TEMP bmValue; \n\
TEMP envMap; \n\ TEMP envMap; \n\
TEMP tmpFog; \n\ TEMP tmpFog; \n\
#read bump map 0 \n\ #read bump map 0 \n\
TEX bmValue, bump0TexCoord, texture[0], 2D; \n\ TEX bmValue, bump0TexCoord, texture[0], 2D; \n\
#bias result (include scaling) \n\ #bias result (include scaling) \n\
MAD bmValue, bmValue, bump0ScaleBias.xxxx, bump0ScaleBias.yyzz; \n\ MAD bmValue, bmValue, bump0ScaleBias.xxxx, bump0ScaleBias.yyzz; \n\
ADD bmValue, bmValue, bump1TexCoord; \n\ ADD bmValue, bmValue, bump1TexCoord; \n\
#read bump map 1 \n\ #read bump map 1 \n\
TEX bmValue, bmValue, texture[1], 2D; \n\ TEX bmValue, bmValue, texture[1], 2D; \n\
#bias result (include scaling) \n\ #bias result (include scaling) \n\
@ -1734,14 +1734,14 @@ ATTRIB bump1TexCoord = fragment.texcoord[1]; \n\
ATTRIB envMapTexCoord = fragment.texcoord[2]; \n\ ATTRIB envMapTexCoord = fragment.texcoord[2]; \n\
ATTRIB diffuseTexCoord = fragment.texcoord[3]; \n\ ATTRIB diffuseTexCoord = fragment.texcoord[3]; \n\
OUTPUT oCol = result.color; \n\ OUTPUT oCol = result.color; \n\
TEMP bmValue; \n\ TEMP bmValue; \n\
TEMP diffuse; \n\ TEMP diffuse; \n\
TEMP envMap; \n\ TEMP envMap; \n\
#read bump map 0 \n\ #read bump map 0 \n\
TEX bmValue, bump0TexCoord, texture[0], 2D; \n\ TEX bmValue, bump0TexCoord, texture[0], 2D; \n\
#bias result (include scaling) \n\ #bias result (include scaling) \n\
MAD bmValue, bmValue, bump0ScaleBias.xxxx, bump0ScaleBias.yyzz; \n\ MAD bmValue, bmValue, bump0ScaleBias.xxxx, bump0ScaleBias.yyzz; \n\
ADD bmValue, bmValue, bump1TexCoord; \n\ ADD bmValue, bmValue, bump1TexCoord; \n\
#read bump map 1 \n\ #read bump map 1 \n\
TEX bmValue, bmValue, texture[1], 2D; \n\ TEX bmValue, bmValue, texture[1], 2D; \n\
#bias result (include scaling) \n\ #bias result (include scaling) \n\
@ -1769,7 +1769,7 @@ ATTRIB envMapTexCoord = fragment.texcoord[2]; \n\
ATTRIB diffuseTexCoord = fragment.texcoord[3]; \n\ ATTRIB diffuseTexCoord = fragment.texcoord[3]; \n\
ATTRIB fogValue = fragment.fogcoord; \n\ ATTRIB fogValue = fragment.fogcoord; \n\
OUTPUT oCol = result.color; \n\ OUTPUT oCol = result.color; \n\
TEMP bmValue; \n\ TEMP bmValue; \n\
TEMP diffuse; \n\ TEMP diffuse; \n\
TEMP envMap; \n\ TEMP envMap; \n\
TEMP tmpFog; \n\ TEMP tmpFog; \n\
@ -1777,7 +1777,7 @@ TEMP tmpFog; \n\
TEX bmValue, bump0TexCoord, texture[0], 2D; \n\ TEX bmValue, bump0TexCoord, texture[0], 2D; \n\
#bias result (include scaling) \n\ #bias result (include scaling) \n\
MAD bmValue, bmValue, bump0ScaleBias.xxxx, bump0ScaleBias.yyzz; \n\ MAD bmValue, bmValue, bump0ScaleBias.xxxx, bump0ScaleBias.yyzz; \n\
ADD bmValue, bmValue, bump1TexCoord; \n\ ADD bmValue, bmValue, bump1TexCoord; \n\
#read bump map 1 \n\ #read bump map 1 \n\
TEX bmValue, bmValue, texture[1], 2D; \n\ TEX bmValue, bmValue, texture[1], 2D; \n\
#bias result (include scaling) \n\ #bias result (include scaling) \n\
@ -2050,18 +2050,18 @@ void CDriverGL::setSwapVBLInterval(uint interval)
} }
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
if (_win && _Extensions.GLXEXTSwapControl) if (_win && _Extensions.GLXEXTSwapControl)
{ {
res = nglXSwapIntervalEXT(_dpy, _win, interval) == 0; res = nglXSwapIntervalEXT(_dpy, _win, interval) == 0;
} }
else if (_Extensions.GLXSGISwapControl) else if (_Extensions.GLXSGISwapControl)
{ {
res = nglXSwapIntervalSGI(interval) == 0; res = nglXSwapIntervalSGI(interval) == 0;
} }
else if (_Extensions.GLXMESASwapControl) else if (_Extensions.GLXMESASwapControl)
{ {
res = nglXSwapIntervalMESA(interval) == 0; res = nglXSwapIntervalMESA(interval) == 0;
} }
#endif #endif
if (res) if (res)
@ -2093,11 +2093,11 @@ uint CDriverGL::getSwapVBLInterval()
glXQueryDrawable(_dpy, _win, GLX_MAX_SWAP_INTERVAL_EXT, &maxSwap); glXQueryDrawable(_dpy, _win, GLX_MAX_SWAP_INTERVAL_EXT, &maxSwap);
nlwarning("The swap interval is %u and the max swap interval is %u", swap, maxSwap); nlwarning("The swap interval is %u and the max swap interval is %u", swap, maxSwap);
return swap; return swap;
} }
else if (_Extensions.GLXMESASwapControl) else if (_Extensions.GLXMESASwapControl)
{ {
return nglXGetSwapIntervalMESA(); return nglXGetSwapIntervalMESA();
} }
#endif #endif
return _Interval; return _Interval;
@ -2459,10 +2459,10 @@ void CDriverGL::displayBench (class NLMISC::CLog *log)
} }
#ifdef NL_DEBUG #ifdef NL_DEBUG
void CDriverGL::dumpMappedBuffers() void CDriverGL::dumpMappedBuffers()
{ {
_AGPVertexArrayRange->dumpMappedBuffers(); _AGPVertexArrayRange->dumpMappedBuffers();
} }
#endif #endif
// *************************************************************************** // ***************************************************************************