bloomForNonNVCardsOnOpenGL.patch

aquiles, 05/27/2010 10:10 pm

Download (3.1 kB)

b/code/nel/src/3d/driver/opengl/driver_opengl.cpp Thu May 27 21:57:44 2010 +0200
1273 1273
		_UserLightEnable[i]= false;
1274 1274

1275 1275
	// init _DriverGLStates
1276
	_DriverGLStates.init(_Extensions.ARBTextureCubeMap, _Extensions.NVTextureRectangle, _MaxDriverLight);
1276
	_DriverGLStates.init(_Extensions.ARBTextureCubeMap, (_Extensions.NVTextureRectangle || _Extensions.EXTTextureRectangle), _MaxDriverLight);
1277 1277

1278 1278

1279 1279
	// Init OpenGL/Driver defaults.
......
4158 4158
bool CDriverGL::supportTextureRectangle() const
4159 4159
{
4160 4160
	H_AUTO_OGL(CDriverGL_supportTextureRectangle)
4161
	return _Extensions.NVTextureRectangle;
4161
	return (_Extensions.NVTextureRectangle || 
4162
	        _Extensions.EXTTextureRectangle);
4162 4163
}
4163 4164

4164 4165
// ***************************************************************************
b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp Thu May 27 21:57:44 2010 +0200
1144 1144
}
1145 1145

1146 1146
// ***************************************************************************
1147
static bool	setupEXTTextureRectangle(const char	*glext)
1148
{
1149
	H_AUTO_OGL(setupEXTTextureRectangle);
1150
	CHECK_EXT("GL_EXT_texture_rectangle");
1151
	return true;
1152
}
1153

1154
// ***************************************************************************
1147 1155
static bool	setupFrameBufferObject(const char	*glext)
1148 1156
{
1149 1157
	H_AUTO_OGL(setupFrameBufferObject);
......
1311 1319
	// Check GL_NV_texture_rectangle
1312 1320
	ext.NVTextureRectangle = setupNVTextureRectangle(glext);
1313 1321

1322
	// Check GL_EXT_texture_rectangle
1323
	ext.EXTTextureRectangle = setupEXTTextureRectangle(glext);
1324

1314 1325
	// Check GL_EXT_framebuffer_object
1315 1326
	ext.FrameBufferObject = setupFrameBufferObject(glext);
1316 1327

b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h Thu May 27 21:57:44 2010 +0200
70 70
	bool	NVTextureShader;
71 71
	bool    NVOcclusionQuery;
72 72
	bool	NVTextureRectangle;
73
	bool    EXTTextureRectangle;
73 74
	bool	FrameBufferObject;
74 75
	bool	PackedDepthStencil;
75 76
	// true if NVVertexProgram and if we know that VP is emulated
......
181 182
		result += ARBTextureCubeMap ? "ARBTextureCubeMap " : "";
182 183
		result += ATIEnvMapBumpMap ? "ATIEnvMapBumpMap " : "";
183 184
		result += NVTextureRectangle ? "NVTextureRectangle " : "";
185
		result += EXTTextureRectangle ? "EXTTextureRectangle " : "";
184 186
		result += ARBTextureNonPowerOfTwo ? "ARBTextureNonPowerOfTwo " : "";
185 187
		result += "texture stages(*) = ";
186 188
		result += NLMISC::toString(NbTextureStages);