magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	0bda17e843	Merge branch 'master' into compatibility Conflicts: src/Magnum/Shader.cpp	12 years ago
Vladimír Vondruš	79c27ef773	ObjImporter: fix compilation on NaCl/newlib.	12 years ago
Vladimír Vondruš	f721cc347e	ObjImporter: who did this?! Inter-project includes should not be in angle brackets.	12 years ago
Vladimír Vondruš	069bdbd011	Fixed deprecated header.	12 years ago
Vladimír Vondruš	6eb9676604	Fix Shader::compile() error output. Because Debug outputs chars as numbers, it displayed the following: compilation of fragment shader321 succeeded ... compilation of vertex shader322 succeeded ... instead of compilation of fragment shader 1 succeeded ... compilation of vertex shader 2 succeeded ... Now I will forever know that ASCII code of space is 32.	12 years ago
Vladimír Vondruš	20c62a20ac	Doc++	12 years ago
Vladimír Vondruš	47bd4d7639	Merge pull request #51 from smw/master fixed build on mac	12 years ago
Vladimír Vondruš	7e6ac192bc	Merge branch 'master' into compatibility	12 years ago
Vladimír Vondruš	4d397bf4f3	Link to proper library on Windows. Probably overdone when prefixing *TestLib libraries.	12 years ago
Vladimír Vondruš	2356802831	Fix linker errors on MSVC. And probably also on MinGW.	12 years ago
Vladimír Vondruš	5843828572	Merge branch 'master' into compatibility Conflicts: src/Magnum/MeshTools/Interleave.h src/Magnum/Platform/GlxApplication.h src/Magnum/Platform/XEglApplication.h	12 years ago
Vladimír Vondruš	cb1649a3f9	package: update ArchLinux PKGBUILD.	12 years ago
Vladimír Vondruš	8a412f1d5d	Use SDL 2 instead of GLUT as the default and recommended toolkit.	12 years ago
Vladimír Vondruš	4573c357a2	Platform: default to non-resizable window in Sdl2Application. The user is not required to provide viewportEvent() implementation, thus it's not wise to allow resizing by default.	12 years ago
Vladimír Vondruš	71a5766594	Added Mesh::addVertexBufferInstanced(). Functionality provided by GL 3.3 and ARB_instanced_arrays, on ES2 this is again implemented in three different extensions -- {ANGLE,EXT,NV}_instanced_arrays. They are disabled until Magnum has proper extension loading on ES.	12 years ago
Vladimír Vondruš	c0056f76d2	Code reorganization.	12 years ago
Vladimír Vondruš	20df20de0f	Support for instanced mesh drawing and base instance. On desktop GL this is provided by ARB_draw_instanced (GL 3.1). Base instance is available only on desktop GL (4.2, ARB_base_instance). In ES2 the instanced functionality is provided by three (!) different extensions (ANGLE_instanced_arrays, EXT_draw_instanced, NV_draw_instanced), the proper implementation is chosen on context creation based on what extension is available. Though we don't have extension loader for ES yet, thus all these extensions are disabled and the implementation has assertion in it. Added blind test which tests only that something has been drawn and no errors were emitted, but not whether the right command is used. I'll probably need to check this later, because the Mesh::draw() behemoth is going slightly out of hand :)	12 years ago
Vladimír Vondruš	6488be5e91	glDrawElementsBaseVertex() needs ARB_draw_elements_base_vertex.	12 years ago
Vladimír Vondruš	2ea0a416ed	Cleanup and code reorganization in MeshGLTest.	12 years ago
Vladimír Vondruš	7d0726e5a5	Doc++	12 years ago
Stefan Wasilewski	0ab546b32c	fixed build on mac	12 years ago
Vladimír Vondruš	072710bb8a	Be less strict in OpenGL ES context version. I didn't yet have time to add more complete support for ES 3.1, but the engine should at least work on it. If the driver reports ES 3.0 or 3.1 it is taken as valid value in both ES2 and ES3 builds (i.e. the engine can work in ES2 mode also on ES3 driver).	12 years ago
Vladimír Vondruš	35bd25201f	Fix usage of reserved GLSL keyword in test.	12 years ago
Vladimír Vondruš	6e0d22095e	Fixed Mesh move constructor/assignment. Missed copying of base vertex.	12 years ago
Vladimír Vondruš	2ae7bfaf14	Max texture LOD bias _is_ available in OpenGL ES 3.	12 years ago
Vladimír Vondruš	55feeb22e5	Added some TODOs related to buffer storage.	12 years ago
Vladimír Vondruš	51a14b9e0b	MeshTools: deprecate mesh/buffer-modifying vertex/index tools. The point of this change is to allow greater flexibility and reduce confusion. When instanced meshes are implemented, MeshTools::interleave() can be used for creating interleaved buffers with per-instance data and then the call to Mesh::setCount() will be harmful and/or confusing, becuase the user would in fact want to call Mesh::setInstanceCount() instead. Similarly, MeshTools::compressIndices() can be used to create index buffer for more than one mesh. GL 4.4 has ARB_buffer_storage, which (in relatively distant future) will mean that the current way of Buffer::setData() will be deprecated in favor of Buffer::setStorage(), similarly as Texture::setStorage() replaced Texture::setImage(). Thus any function which calls Buffer::setData() internally is not future-proof. The old MeshTools::compressIndices() and MeshTools::interleave() overloads are marked as deprecated and will be removed in future release.	12 years ago
Vladimír Vondruš	2834e6029e	Added test for mesh base vertex.	12 years ago
Vladimír Vondruš	5e06b776cf	Updated MeshView to reflect changes in Mesh. Added base vertex specification, not differentiating between vertex and index count. The old setVertexRange(), setIndexRange(4) and setIndexRange(2) are now aliases to new setCount(), setBaseVertex(), setIndexRange(3) and setIndexRangge(1) functions, are marked as deprecated and will be removed in future release.	12 years ago
Vladimír Vondruš	7c2ef76048	Ability to specify base vertex in Mesh. The well-known issue is that glDrawElementsBaseVertex() is not supported in OpenGL ES. It is possible to work around it by reconfiguring whole VAO, but that seems to be a bit overkill. Currently the draw() function just asserts that base vertex is not specified for indexed meshes.	12 years ago
Vladimír Vondruš	bfa2a42638	Don't differentiate between vertex and index count in Mesh. Only one value from these two was used in the end, wasting precious bytes. Also these two values were used to differentiate between indexed and non-indexed mesh (instead of relying on actual index buffer being bound), which was very confusing. This approach looks more clean. The MeshView class is not yet updated, as the change would expose some features that aren't possible in current implementation (base vertex specification). Merged Mesh::setVertexCount() and Mesh::setIndexCount() into one Mesh::setCount(), the two original functions are now guarded aliases to the new one, are marked as deprecated and will be removed in future release, similarly for the getters. In particular, if the mesh is indexed, setVertexCount() does nothing and vertexCount() returns 0. The setIndexCount() and indexCount() do and return the same regardless of whether the mesh is indexed or not.	12 years ago
Vladimír Vondruš	d772f51050	Hide texture state members which are not used on ES. Shaved eight bytes off total memory footprint, yay!	12 years ago
Vladimír Vondruš	54cb177bb0	Properly initialize variables for texture limits in state tracker. And I was wondering how it is possible that there new NVidia drivers were allowing up to 32 PB textures on my humble laptop graphics :)	12 years ago
Vladimír Vondruš	153f57f5b1	Fix CubeMapTexture mipmap generation test. On new NVidia drivers 337.12 it reports that the texture is not cube map complete.	12 years ago
Vladimír Vondruš	ee403494fb	Doc++	12 years ago
Vladimír Vondruš	74ae14b44a	Remove unused members from ES build.	12 years ago
Vladimír Vondruš	8c0c80a5c3	Implemented ARB_texture_swizzle.	12 years ago
Vladimír Vondruš	1b1ad41ae1	Renamed internal function to avoid name clashes.	12 years ago
Vladimír Vondruš	11ea906e47	Doc++ Sometimes the specification hides the information very well.	12 years ago
Vladimír Vondruš	325d139353	Doc++	12 years ago
Vladimír Vondruš	ef897de79e	Implemented depth texture compare mode and function.	12 years ago
Vladimír Vondruš	3e40bdd443	Doc++ Also remove redundant preprocessor branches.	12 years ago
Vladimír Vondruš	bbd1d94e73	Platform: nicer vector value display in magnum-info.	12 years ago
Vladimír Vondruš	f16a607a6f	Platform: display max texture size in magnum-info.	12 years ago
Vladimír Vondruš	2cbcdeaeb4	Queries for max supported texture size.	12 years ago
Vladimír Vondruš	f9e49283e6	Fix includes. Vector3 was used but not included.	12 years ago
Vladimír Vondruš	99281a1bd1	Cleaned up duplicate stuff in CMakeLists.	12 years ago
Vladimír Vondruš	004e94abda	doc: more GL command mapping updates.	12 years ago
Vladimír Vondruš	8a98ab0675	Implementation of ARB_stencil_texturing.	12 years ago
Vladimír Vondruš	af9772bdc0	Add forgotten check to extension-dependent texture tests.	12 years ago

1 2 3 4 5 ...

3766 Commits (0bda17e8436aba65ea574ab649ea13ebba432816) All Branches Search

3766 Commits (0bda17e8436aba65ea574ab649ea13ebba432816)

All Branches