Mirrorlandia_minetest/irrlicht
1
0
Fork 1
mirror of https://github.com/minetest/irrlicht.git synced 2024-11-18 05:33:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove primitive types not supported in OpenGL 3+

Browse Source 
I removed old primitive types that do not work with modern OpenGL.
This commit is contained in:
Caleb Butler 2023-09-03 17:18:43 -04:00 committed by sfan5
parent c6b06533f3
commit 3492fd0d2d
3 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/EPrimitiveTypes.h
View File

@ -36,20 +36,6 @@ namespace scene
//! Explicitly set all vertices for each triangle. //! Explicitly set all vertices for each triangle.
EPT_TRIANGLES, EPT_TRIANGLES,
//! After the first two vertices each further two vertices create a quad with the preceding two.
//! Not supported by Direct3D
EPT_QUAD_STRIP,
//! Every four vertices create a quad.
//! Not supported by Direct3D
//! Deprecated with newer OpenGL drivers
EPT_QUADS,
//! Just as LINE_LOOP, but filled.
//! Not supported by Direct3D
//! Deprecated with newer OpenGL drivers
EPT_POLYGON,
//! The single vertices are expanded to quad billboards on the GPU. //! The single vertices are expanded to quad billboards on the GPU.
EPT_POINT_SPRITES EPT_POINT_SPRITES
}; };

3
include/IMeshBuffer.h
View File

@ -172,9 +172,6 @@ namespace scene
case scene::EPT_TRIANGLE_STRIP: return (indexCount-2); case scene::EPT_TRIANGLE_STRIP: return (indexCount-2);
case scene::EPT_TRIANGLE_FAN: return (indexCount-2); case scene::EPT_TRIANGLE_FAN: return (indexCount-2);
case scene::EPT_TRIANGLES: return indexCount/3; case scene::EPT_TRIANGLES: return indexCount/3;
case scene::EPT_QUAD_STRIP: return (indexCount-2)/2;
case scene::EPT_QUADS: return indexCount/4;
case scene::EPT_POLYGON: return indexCount; // (not really primitives, that would be 1, works like line_strip)
case scene::EPT_POINT_SPRITES: return indexCount; case scene::EPT_POINT_SPRITES: return indexCount;
} }
return 0; return 0;

15
source/Irrlicht/COpenGLDriver.cpp
View File

@ -1034,15 +1034,6 @@ void COpenGLDriver::renderArray(const void* indexList, u32 primitiveCount,
case scene::EPT_TRIANGLES: case scene::EPT_TRIANGLES:
glDrawElements(GL_TRIANGLES, primitiveCount*3, indexSize, indexList); glDrawElements(GL_TRIANGLES, primitiveCount*3, indexSize, indexList);
break; break;
case scene::EPT_QUAD_STRIP:
glDrawElements(GL_QUAD_STRIP, primitiveCount*2+2, indexSize, indexList);
break;
case scene::EPT_QUADS:
glDrawElements(GL_QUADS, primitiveCount*4, indexSize, indexList);
break;
case scene::EPT_POLYGON:
glDrawElements(GL_POLYGON, primitiveCount, indexSize, indexList);
break;
} }
} }
@ -3893,12 +3884,6 @@ GLenum COpenGLDriver::primitiveTypeToGL(scene::E_PRIMITIVE_TYPE type) const
return GL_TRIANGLE_FAN; return GL_TRIANGLE_FAN;
case scene::EPT_TRIANGLES: case scene::EPT_TRIANGLES:
return GL_TRIANGLES; return GL_TRIANGLES;
case scene::EPT_QUAD_STRIP:
return GL_QUAD_STRIP;
case scene::EPT_QUADS:
return GL_QUADS;
case scene::EPT_POLYGON:
return GL_POLYGON;
case scene::EPT_POINT_SPRITES: case scene::EPT_POINT_SPRITES:
#ifdef GL_ARB_point_sprite #ifdef GL_ARB_point_sprite
return GL_POINT_SPRITE_ARB; return GL_POINT_SPRITE_ARB;