archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
79,282 Commits 660 Branches 0 Tags
c9bd61b37240ad000ae7ac4d49801e4afe3565b0
Commit Graph

16 Commits

Author SHA1 Message Date
Campbell Barton
9bd0c63382 Merge branch 'master' into blender2.8 2018-06-29 08:05:38 +02:00
Campbell Barton
af36dd4664 Cleanup: trailing newlines 2018-06-29 08:02:49 +02:00
Mike Erwin
4c08c5b192 OpenGL: use new matrix names in GLSL 
Builtin names staring with gl_ will not be available in core profile. Same with the ftransform function. New matrix API provides the same names minus the gl_ prefix.

Part of T49450
 2017-03-26 21:23:55 -04:00
Dalai Felinto
5ed5ed59c3 Fix T49861: Interlace stereo drawing 
This does not address stapling shader in 2.8, though the solution can be
similar (own shader, not polutting interlace shader).

part of T49043

Reviewers: merwin

Differential Revision: https://developer.blender.org/D2440
 2017-01-09 17:58:13 +01:00
Mike Erwin
ad32b774cb fix basic shader syntax when drawing lines 
Fixed on GL 3.2+, Mac still lays an egg due to the geometry shader.
 2016-09-27 21:05:48 +02:00
Alexander Romanov
6798809c7e Flat shading for basic shader 
The purpose of the patch is to replace deprecated  glShadeModel.

To decrease glShadeModel calls I've set GL_SMOOTH by default

Reviewers: merwin, brecht

Reviewed By: brecht

Subscribers: blueprintrandom, Evgeny_Rodygin, AlexKowel, yurikovelenov

Differential Revision: https://developer.blender.org/D1958
 2016-06-10 05:38:17 +10:00
Campbell Barton
10d57f991b Merge branch 'master' into blender2.8 2016-06-10 05:15:06 +10:00
Campbell Barton
5bd9e83289 GPU: Fix triple buffer w/ basic glsl shader 
Needed to add GL_TEXTURE_RECTANGLE support to basic-shader.
 2016-06-08 05:40:21 +10:00
Bastien Montagne
11af9e9a5b Merge branch 'master' into blender2.8 
Conflicts:
	intern/cycles/blender/blender_curves.cpp
	intern/cycles/blender/blender_particles.cpp
	source/blender/depsgraph/intern/builder/deg_builder_relations.h
	source/blender/depsgraph/intern/depsgraph_build.cc
 2016-06-01 14:34:11 +02:00
Campbell Barton
7424ded9c7 Cleanup: glsl style 2016-05-26 18:53:09 +10:00
Bastien Montagne
faec430914 Merge branch 'master' into blender2.8 
Conflicts:
	intern/cycles/blender/blender_curves.cpp
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/transform/transform_snap_object.c
	source/blender/editors/util/undo.c
	source/blender/makesrna/intern/rna_object_force.c
 2016-05-24 16:48:10 +02:00
Campbell Barton
de8494b54e Cleanup: glsl indentation, line length 2016-05-23 19:56:50 +10:00
Alexander Romanov
f85745b17b Flat shading for basic shader 
The purpose of the patch is to replace deprecated  glShadeModel.

To decrease glShadeModel calls I've set GL_SMOOTH by default

Reviewers: merwin, brecht

Reviewed By: brecht

Subscribers: blueprintrandom, Evgeny_Rodygin, AlexKowel, yurikovelenov

Differential Revision: https://developer.blender.org/D1958
 2016-05-16 11:13:21 +03:00
Alexander Romanov
d969192fbe Wide lines + line stipple deprecated API replacement 
The patch contains an implementation of the wide lines and the line stipple that is necessary for OpenGL upgrade.

For the implementation I have chosen the geometry shader because it required minimum changes for the wrapper calls and such implementation is the best for the "basic shader" architecture.

There are few shortcomings that can be corrected in future. They all are related to the fact that the lines in one strip are not connected with each other. So the stipple pattern is not continuous on the common vertex of two lines. There is also no continuity of form (each line is an independent rectangular).
But the advantage is that even outdated glBegin, glVertex work! Though with the above restrictions.
Continuity of form and stipple can be implemented with additional attributes, and it will require more changes in calls.

At the moment, the patch replaces calls for some "gestures". It works satisfactorily for "cross" or "rectangular" and not so good for "lasso" and "circle" due to the above-mentioned shortcomings.

Don't forget to set USE_GLSL to true for testing.

Alexander Romanov (Blend4Web Team)

Reviewers: merwin, brecht

Reviewed By: merwin, brecht

Subscribers: aligorith, Evgeny_Rodygin, AlexKowel, yurikovelenov

Differential Revision: https://developer.blender.org/D1880
 2016-04-08 10:58:40 +03:00
Alexander Romanov
700c40e2f9 OpenGL: stipple support added to basic GLSL shader 
The is intended to replace the deprecated glPolygonStipple() calls with a shader
based alternative, once we switch over to GLSL shaders.

Reviewers: brecht

Differential Revision: https://developer.blender.org/D1688
 2015-12-26 22:15:23 +01:00
Brecht Van Lommel
4aab21f9be OpenGL: rename simple shader to basic shader. 2015-12-06 19:35:15 +01:00