diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-12-05 14:02:24 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-12-05 14:02:24 +0300 |
| commit | e2806b7429c7d001687ae42e5173827989bb8e42 (patch) | |
| tree | 6ebed9265466f11949efdbde4924415988254468 /source/blender/draw/intern/shaders | |
| parent | 798b977d95be54c8cbbe09d4b7861cdbfc25ea2d (diff) | |
Revert "Fix T71576 Mesh error on mutimaterial Meshes on legacy nvidia drivers"
This reverts commit cf77b67c459d481f6d8d34d13e14d22a6cad0842.
Diffstat (limited to 'source/blender/draw/intern/shaders')
| -rw-r--r-- | source/blender/draw/intern/shaders/common_view_lib.glsl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl index 182a4c72fe5..1a28a307163 100644 --- a/source/blender/draw/intern/shaders/common_view_lib.glsl +++ b/source/blender/draw/intern/shaders/common_view_lib.glsl @@ -80,7 +80,7 @@ uniform int baseInstance; # if defined(IN_PLACE_INSTANCES) || defined(INSTANCED_ATTRIB) /* When drawing instances of an object at the same position. */ # define instanceId 0 -# elif defined(GPU_DEPRECATED_AMD) +# elif defined(GPU_DEPRECATED_AMD_DRIVER) /* A driver bug make it so that when using an attribute with GL_INT_2_10_10_10_REV as format, * the gl_InstanceID is incremented by the 2 bit component of the attrib. * Ignore gl_InstanceID then. */ @@ -115,11 +115,8 @@ flat in int resourceIDFrag; # define resource_id resourceIDFrag #endif -#if !defined(GPU_INTEL) && !defined(GPU_DEPRECATED_AMD) && !defined(GPU_DEPRECATED_NVIDIA) -# define USE_INDEXED_MODELMAT -#endif - -#if defined(USE_INDEXED_MODELMAT) && !defined(OS_MAC) && !defined(INSTANCED_ATTRIB) +#if !defined(GPU_INTEL) && !defined(GPU_DEPRECATED_AMD_DRIVER) && !defined(OS_MAC) && \ + !defined(INSTANCED_ATTRIB) struct ObjectMatrices { mat4 drw_modelMatrix; mat4 drw_modelMatrixInverse; |