From a2ea606377ed5679dc513eabcf2d398216b47d61 Mon Sep 17 00:00:00 2001
From: Michal Krol <mjkrol@gmail.org>
Date: Mon, 13 Feb 2006 11:23:36 +0000
Subject: Add ARB_vertex_shader stage just before render stage. If enabled, all
 other stages, except render, are disabled.

---
 src/mesa/tnl/t_vb_normals.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/mesa/tnl/t_vb_normals.c')

diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c
index 7ac33f8bec..e87a67981e 100644
--- a/src/mesa/tnl/t_vb_normals.c
+++ b/src/mesa/tnl/t_vb_normals.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -95,6 +95,11 @@ validate_normal_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
 {
    struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL) {
+      store->NormalTransform = NULL;
+      return;
+   }
+
    if (ctx->VertexProgram._Enabled ||
        (!ctx->Light.Enabled &&
 	!(ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS))) {
-- 
cgit v1.2.3