magnum

Commit Graph

Author	SHA1	Message	Date
Vladimír Vondruš	822fa0d644	Updated copyright year.	4 years ago
Vladimír Vondruš	026aa7757e	Shaders: instancedNormalMatrix isn't needed if Phong has zero lights. And add an explicit construction test for this case.	4 years ago
Vladimír Vondruš	df75ab926a	Shaders: calculate Phong light directions in the fragment shader. Hm, I wonder why I did it this way, the operation isn't really heavy to benefit from the hardware interpolators, and with a lot of lights we'd hit the maximum output count in the vertex shader. With classic uniforms this seems to be ~5% faster on both Intel and AMD cards. With UBOs this is ~15% (!) faster on AMD (I guess because the constant UBO access overhead is moved to just one stage instead of both?) but slower on Intel (of course, sigh... I assume due to UBO reads being slow and so when done for every fragment instead of every vertex it costs more?). Since this benefits the real GPUs while the card that was already awful is more awful I don't think that's a big deal. This change stays.	5 years ago
Vladimír Vondruš	fd3bd7e737	Shaders: ANGLE, for fucks sake!	5 years ago
Vladimír Vondruš	c92d608aa7	Shaders: assume drawOffset is 0 if DRAW_COUNT is 1. This is always true in the single-draw case, since setDrawOffset() asserts on this. In the multi-draw case this optimization doesn't make sense, because it doesn't make sense to create a multidraw shader with just one draw. On an Intel 630 GPU this resulted in single-draw single-material Phong to go from 550 ms to 440, which is roughly a 20% improvement. For the simpler shaders the difference is even higher. The multidraw numbers stayed the same as before, obviously.	5 years ago
Vladimír Vondruš	95379ace8e	Shaders: support array textures in Flat and Phong.	5 years ago
Vladimír Vondruš	658e8109a1	Shaders: fix grouping in Phong.vert.	5 years ago
Vladimír Vondruš	2c09a2a1e6	Shaders: multidraw support in all builtin shaders.	5 years ago
Vladimír Vondruš	ef9da0ec96	Shaders: add UBO support to all shaders.	5 years ago
Vladimír Vondruš	9f0a61e76e	Shaders: group things together also in GLSL sources. It was also becoming quite a mess in there.	5 years ago
Vladimír Vondruš	3d136503d8	Updated copyright year.	5 years ago
Vladimír Vondruš	ba156d329a	Shaders: stray semicolon in a GLSL source. Interestingly, this makes only Apple's GLSL compiler throw up.	6 years ago
Vladimír Vondruš	7257bbb871	Shaders: rework Phong to support directional and attenuated point lights. This is a -- long overdue -- breaking change to the rendering output of this shader, finally adding support for lights that get darker over distance. The attenuation equation is basically what's documented in LightData, and the distinction between directional and point lights is made using a newly added the fourth component of position (which means the old three-component setters are all deprecated). This allows the shader code to be practically branchless, which I find to be nice. This breaks basically all rendering output so all existing Phong and MeshTools::compile() test outputs had to be regenerated.	6 years ago
Vladimír Vondruš	903e2c213c	Shaders: properly use bitangents in Phong normal map calculation.	6 years ago
Vladimír Vondruš	5285dcc986	Shaders: add a normal texture scale parameter to Phong. It's needed to support the new material attributes supported by glTF. The test output is slightly different as the normal coming from the texture wasn't normalized before.	6 years ago
Eric Undersander	8b8b9c456b	Shaders: remove incorrect light direction normalization in Phong.vert. Adapted slight changes in existing tests, the new ground truth now passes.	6 years ago
Vladimír Vondruš	19e0e96d74	Updated copyright year.	6 years ago
Vladimír Vondruš	881a50f7fa	Shaders: clarify that object ID features need GL 3.0 extensions. Important for Zink, which has neither of them.	6 years ago
Vladimír Vondruš	55685ea382	Shaders: implement instancing in Phong.	6 years ago
Vladimír Vondruš	02525527a4	Shaders: ability to render instanced object ID in Flat/Phong.	6 years ago
Vladimír Vondruš	9a06b3515b	Shaders: implement texture coordinate transformation for all shaders. Except MeshVisualizer and VertexColor, which don't have any texturing, so there it's not needed. In most cases the tests are reusing existing ground truth files and only modifying transformations / flipping images.	6 years ago
Vladimír Vondruš	a35d53118b	Shaders: name the textureCoordinates attribute consistently in GLSL. Interestingly enough, on Phong it was named textureCoords while on the C++ side it was asking for textureCoordinates, and I don't remember this being an issue ever, on any driver.	6 years ago
Vladimír Vondruš	5617cb5199	Shaders: vertex color support in Phong and Flat.	7 years ago
Vladimír Vondruš	a3c8d8ec63	Shaders: allow Phong with zero lights. Which makes it equivalent to Flat3D. Useful to reduce complexity in apps that render models with pre-baked lighting.	7 years ago
Vladimír Vondruš	87ac8a8cd2	Shaders: support object ID output in Flat and Phong.	7 years ago
Vladimír Vondruš	0cb4ded506	Shaders: add normal texture support to Phong. Note -- since there are no visual tests for Phong yet, this is done in the least intrusive manner to avoid breaking current functionality. It's likely very underperforming due to the matric calculation per fragment, it'll get optimized once I have proper tests.	7 years ago
Vladimír Vondruš	e6b7aa12fa	Updated copyright year.	7 years ago
Vladimír Vondruš	b615e1ae28	Shaders: support multiple lights in Phong.	8 years ago
Vladimír Vondruš	0e9cb6945e	Shaders: define reasonable uniform defaults for all shaders. Plus a bit of cleanup / fixing broken English.	8 years ago
Vladimír Vondruš	623fa97970	Updated copyright year.	8 years ago
Vladimír Vondruš	7a16273e5d	Updated copyright year.	9 years ago
Vladimír Vondruš	23646e6690	Hell, this project is big.	10 years ago
Vladimír Vondruš	8c2eaea406	Shaders: more shader code cleanup. Fixed random potential GLSL ES issues, reduced preprocessor madness.	11 years ago
Vladimír Vondruš	6488fe6e75	Oh, it's 2015 already.	11 years ago
Vladimír Vondruš	6f0ba96cb6	Happy new year too.	12 years ago
Vladimír Vondruš	45a10cefdf	Making includes absolute, part 1: moving files around. Everything what was in src/ is now in src/Corrade, everything from src/Plugins is now in src/MagnumPlugins, everything from external/ is in src/MagnumExternal. Added new CMakeLists.txt file and updated the other ones for the moves, no other change was made. If MAGNUM_BUILD_DEPRECATED is set, everything compiles and installs like previously except for the plugins, which are now in MagnumPlugins and not in Magnum/Plugins.	13 years ago
Vladimír Vondruš	51db425bdb	Shaders: use generic definitions also in GLSL sources. So each sourcs doesn't need to be manually rewritten each time the generic definition changes.	13 years ago
Vladimír Vondruš	ef42287cf9	Shaders: use location 1 for texture coordinates and location 2 for normals.	13 years ago
Vladimír Vondruš	41f7784dc5	Shaders: ambient, diffuse and specular texture support in Phong.	13 years ago
Vladimír Vondruš	623fda0dc7	Shaders: removed superfluous `*Shader` suffix from class names.	13 years ago
Vladimír Vondruš	c5ab86794b	Relicensing to MIT/Expat license, part 3: source files. Added license header also to shader sources. Hopefully it won't harm compilation times too much.	13 years ago
Vladimír Vondruš	7a894e97a0	Using ARB_explicit_uniform_location in shaders. The backwards compatibility fully kills the purpose, but at least I can test the feature somewhere :-)	14 years ago
Vladimír Vondruš	308a92a911	Shaders: pass normal matrix the right way. Besides that this was long overdue, GLSL ES doesn't have mat3x3().	14 years ago
Vladimír Vondruš	81b69f17e1	Shaders: another iteration in porting of Phong and Flat shaders to GLES. Hope the reduced precision won't hurt.	14 years ago
Vladimír Vondruš	084294e60b	Blind port of PhongShader to OpenGL ES 2.0.	14 years ago
Vladimír Vondruš	5ad3844626	PhongShader: fall back to GLSL 1.20 if 3.30/3.20 is not supported.	14 years ago
Vladimír Vondruš	40523e530c	PhongShader: using `position` for vertex position.	14 years ago
Vladimír Vondruš	4152e1fc9d	Better ability to create portable shaders. Now the #version string is added from Shader class itself, making it possible to do workarounds for older versions more conveniently. As a consequence, #version must not be part of shader source anymore.	14 years ago
Vladimír Vondruš	e868d8e03c	Deprecating AbstractShaderProgram::bind*Location(). Preferred workflow is to specify attribute location explicitly in the shader. The functions remains here as some old Intel systems don't support the required extension ARB_explicit_attrib_location (and it's not in GL 3.0 either). Also updated and fixed the documentation. Function bindAttribute() was renamed to bindAttributeLocation() to be consistent with bindFragmentDataLocation(). PhongShader now uses explicit attribute location.	14 years ago
Vladimír Vondruš	d1f5ec7479	Phong shader: finally fixed specular highlights. The highlights are now based on camera position, which is finally the way it should be since forever.	14 years ago

36 Commits (82a1f8e76787caa3e4e6a7fdc4519df2a698e69a)