forked from 0ad/0ad
Fix OpenGL ES 2.0 Warnings.
This was SVN commit r26167.
This commit is contained in:
parent
5e3426794c
commit
0a8d382657
@ -647,6 +647,7 @@ public:
|
||||
if (it != m_VertexAttribs.end())
|
||||
{
|
||||
#if CONFIG2_GLES
|
||||
UNUSED2(size); UNUSED2(type); UNUSED2(stride); UNUSED2(pointer);
|
||||
debug_warn(L"glVertexAttribIPointer not supported on GLES");
|
||||
#else
|
||||
glVertexAttribIPointerEXT(it->second, size, type, stride, pointer);
|
||||
|
||||
@ -89,27 +89,32 @@
|
||||
#define GL_DEPTH_COMPONENT32 GL_DEPTH_COMPONENT32_OES
|
||||
|
||||
// GL_KHR_debug
|
||||
#define glPopDebugGroupKHR glPopDebugGroup
|
||||
#define glPushDebugGroupKHR glPushDebugGroup
|
||||
#define GL_DEBUG_SOURCE_API_KHR GL_DEBUG_SOURCE_API
|
||||
#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR GL_DEBUG_SOURCE_WINDOW_SYSTEM
|
||||
#define GL_DEBUG_SOURCE_SHADER_COMPILER_KHR GL_DEBUG_SOURCE_SHADER_COMPILER
|
||||
#define GL_DEBUG_SOURCE_THIRD_PARTY_KHR GL_DEBUG_SOURCE_THIRD_PARTY
|
||||
#define GL_DEBUG_SOURCE_APPLICATION_KHR GL_DEBUG_SOURCE_APPLICATION
|
||||
#define GL_DEBUG_SOURCE_OTHER_KHR GL_DEBUG_SOURCE_OTHER
|
||||
#define GL_DEBUG_TYPE_ERROR_KHR GL_DEBUG_TYPE_ERROR
|
||||
#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR
|
||||
#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR
|
||||
#define GL_DEBUG_TYPE_PORTABILITY_KHR GL_DEBUG_TYPE_PORTABILITY
|
||||
#define GL_DEBUG_TYPE_PERFORMANCE_KHR GL_DEBUG_TYPE_PERFORMANCE
|
||||
#define GL_DEBUG_TYPE_OTHER_KHR GL_DEBUG_TYPE_OTHER
|
||||
#define GL_DEBUG_TYPE_MARKER_KHR GL_DEBUG_TYPE_MARKER
|
||||
#define GL_DEBUG_TYPE_PUSH_GROUP_KHR GL_DEBUG_TYPE_PUSH_GROUP
|
||||
#define GL_DEBUG_TYPE_POP_GROUP_KHR GL_DEBUG_TYPE_POP_GROUP
|
||||
#define GL_DEBUG_SEVERITY_HIGH_KHR GL_DEBUG_SEVERITY_HIGH
|
||||
#define GL_DEBUG_SEVERITY_MEDIUM_KHR GL_DEBUG_SEVERITY_MEDIUM
|
||||
#define GL_DEBUG_SEVERITY_LOW_KHR GL_DEBUG_SEVERITY_LOW
|
||||
#define GL_DEBUG_SEVERITY_NOTIFICATION_KHR GL_DEBUG_SEVERITY_NOTIFICATION
|
||||
#define glDebugMessageCallback glDebugMessageCallbackKHR
|
||||
#define glDebugMessageControl glDebugMessageControlKHR
|
||||
#define glObjectLabel glObjectLabelKHR
|
||||
#define glPopDebugGroup glPopDebugGroupKHR
|
||||
#define glPushDebugGroup glPushDebugGroupKHR
|
||||
|
||||
#define GL_DEBUG_OUTPUT GL_DEBUG_OUTPUT_KHR
|
||||
#define GL_DEBUG_SEVERITY_HIGH GL_DEBUG_SEVERITY_HIGH_KHR
|
||||
#define GL_DEBUG_SEVERITY_LOW GL_DEBUG_SEVERITY_LOW_KHR
|
||||
#define GL_DEBUG_SEVERITY_MEDIUM GL_DEBUG_SEVERITY_MEDIUM_KHR
|
||||
#define GL_DEBUG_SEVERITY_NOTIFICATION GL_DEBUG_SEVERITY_NOTIFICATION_KHR
|
||||
#define GL_DEBUG_SOURCE_API GL_DEBUG_SOURCE_API_KHR
|
||||
#define GL_DEBUG_SOURCE_APPLICATION GL_DEBUG_SOURCE_APPLICATION_KHR
|
||||
#define GL_DEBUG_SOURCE_OTHER GL_DEBUG_SOURCE_OTHER_KHR
|
||||
#define GL_DEBUG_SOURCE_SHADER_COMPILER GL_DEBUG_SOURCE_SHADER_COMPILER_KHR
|
||||
#define GL_DEBUG_SOURCE_THIRD_PARTY GL_DEBUG_SOURCE_THIRD_PARTY_KHR
|
||||
#define GL_DEBUG_SOURCE_WINDOW_SYSTEM GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR
|
||||
#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR
|
||||
#define GL_DEBUG_TYPE_ERROR GL_DEBUG_TYPE_ERROR_KHR
|
||||
#define GL_DEBUG_TYPE_MARKER GL_DEBUG_TYPE_MARKER_KHR
|
||||
#define GL_DEBUG_TYPE_OTHER GL_DEBUG_TYPE_OTHER_KHR
|
||||
#define GL_DEBUG_TYPE_PERFORMANCE GL_DEBUG_TYPE_PERFORMANCE_KHR
|
||||
#define GL_DEBUG_TYPE_POP_GROUP GL_DEBUG_TYPE_POP_GROUP_KHR
|
||||
#define GL_DEBUG_TYPE_PORTABILITY GL_DEBUG_TYPE_PORTABILITY_KHR
|
||||
#define GL_DEBUG_TYPE_PUSH_GROUP GL_DEBUG_TYPE_PUSH_GROUP_KHR
|
||||
#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR
|
||||
|
||||
#endif // CONFIG2_GLES
|
||||
|
||||
|
||||
@ -45,6 +45,7 @@ void CDebugRenderer::DrawLine(const CVector3D& from, const CVector3D& to, const
|
||||
void CDebugRenderer::DrawLine(const std::vector<CVector3D>& line, const CColor& color, const float width)
|
||||
{
|
||||
#if CONFIG2_GLES
|
||||
UNUSED2(line); UNUSED2(color); UNUSED2(width);
|
||||
#warning TODO: implement drawing line for GLES
|
||||
#else
|
||||
CShaderTechniquePtr debugLineTech =
|
||||
@ -97,6 +98,7 @@ void CDebugRenderer::DrawLine(const std::vector<CVector3D>& line, const CColor&
|
||||
void CDebugRenderer::DrawCircle(const CVector3D& origin, const float radius, const CColor& color)
|
||||
{
|
||||
#if CONFIG2_GLES
|
||||
UNUSED2(origin); UNUSED2(radius); UNUSED2(color);
|
||||
#warning TODO: implement drawing circle for GLES
|
||||
#else
|
||||
CShaderTechniquePtr debugCircleTech =
|
||||
@ -141,7 +143,8 @@ void CDebugRenderer::DrawCircle(const CVector3D& origin, const float radius, con
|
||||
void CDebugRenderer::DrawCameraFrustum(const CCamera& camera, const CColor& color, int intermediates)
|
||||
{
|
||||
#if CONFIG2_GLES
|
||||
#warning TODO: implement camera frustum for GLES
|
||||
UNUSED2(camera); UNUSED2(color); UNUSED2(intermediates);
|
||||
#warning TODO: implement camera frustum for GLES
|
||||
#else
|
||||
CCamera::Quad nearPoints;
|
||||
CCamera::Quad farPoints;
|
||||
|
||||
@ -598,7 +598,8 @@ void OverlayRenderer::RenderForegroundOverlays(const CCamera& viewCamera)
|
||||
PROFILE3_GPU("overlays (fg)");
|
||||
|
||||
#if CONFIG2_GLES
|
||||
#warning TODO: implement OverlayRenderer::RenderForegroundOverlays for GLES
|
||||
UNUSED2(viewCamera);
|
||||
#warning TODO: implement OverlayRenderer::RenderForegroundOverlays for GLES
|
||||
#else
|
||||
if (g_Renderer.GetSceneRenderer().GetOverlayRenderMode() == WIREFRAME)
|
||||
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
|
||||
|
||||
@ -182,7 +182,8 @@ void TerrainOverlay::RenderTile(const CColor& color, bool draw_hidden, ssize_t i
|
||||
}
|
||||
|
||||
#if CONFIG2_GLES
|
||||
#warning TODO: implement TerrainOverlay::RenderTile for GLES
|
||||
UNUSED2(color); UNUSED2(i); UNUSED2(j);
|
||||
#warning TODO: implement TerrainOverlay::RenderTile for GLES
|
||||
#else
|
||||
|
||||
CVector3D pos[2][2];
|
||||
@ -257,7 +258,8 @@ void TerrainOverlay::RenderTileOutline(const CColor& color, int line_width, bool
|
||||
}
|
||||
|
||||
#if CONFIG2_GLES
|
||||
#warning TODO: implement TerrainOverlay::RenderTileOutline for GLES
|
||||
UNUSED2(color); UNUSED2(line_width); UNUSED2(i); UNUSED2(j);
|
||||
#warning TODO: implement TerrainOverlay::RenderTileOutline for GLES
|
||||
#else
|
||||
|
||||
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
|
||||
|
||||
@ -302,7 +302,8 @@ void TerrainRenderer::RenderPatches(int cullGroup, const CColor& color)
|
||||
return;
|
||||
|
||||
#if CONFIG2_GLES
|
||||
#warning TODO: implement TerrainRenderer::RenderPatches for GLES
|
||||
UNUSED2(color);
|
||||
#warning TODO: implement TerrainRenderer::RenderPatches for GLES
|
||||
#else
|
||||
|
||||
CShaderTechniquePtr dummyTech = g_Renderer.GetShaderManager().LoadEffect(str_dummy);
|
||||
|
||||
@ -841,7 +841,8 @@ void WaterManager::RenderWaves(const CFrustum& frustrum)
|
||||
{
|
||||
OGL_SCOPED_DEBUG_GROUP("Render Waves");
|
||||
#if CONFIG2_GLES
|
||||
#warning Fix WaterManager::RenderWaves on GLES
|
||||
UNUSED2(frustrum);
|
||||
#warning Fix WaterManager::RenderWaves on GLES
|
||||
#else
|
||||
if (!m_WaterFancyEffects)
|
||||
return;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user