From bb39ee50fe1c7bdbad41b9719dcfd01d1851da22 Mon Sep 17 00:00:00 2001 From: Da Woon Jung Date: Mon, 22 Sep 2008 14:47:59 +0000 Subject: [PATCH] Fix for #1864979 - ambient light may look incorrect in legacy arb shaders --- shaders/diffuse2_arb.vp | 2 +- shaders/diffuse_arb.vp | 2 +- shaders/diffuse_texoff2_arb.vp | 2 +- shaders/diffuse_texoff_arb.vp | 2 +- shaders/rings_arb.vp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shaders/diffuse2_arb.vp b/shaders/diffuse2_arb.vp index ea08ae4df..7ffcfa805 100644 --- a/shaders/diffuse2_arb.vp +++ b/shaders/diffuse2_arb.vp @@ -10,7 +10,7 @@ PARAM lightDir0 = program.env[0]; PARAM diffuse0 = program.env[2]; PARAM lightDir1 = program.env[18]; PARAM diffuse1 = program.env[19]; -PARAM ambient = state.lightmodel.ambient; +PARAM ambient = program.env[5]; PARAM zeroVec = { 0, 0, 0, 0 }; OUTPUT oPos = result.position; OUTPUT oColor = result.color; diff --git a/shaders/diffuse_arb.vp b/shaders/diffuse_arb.vp index f31f32dff..2a1b92db0 100644 --- a/shaders/diffuse_arb.vp +++ b/shaders/diffuse_arb.vp @@ -8,7 +8,7 @@ ATTRIB iTex0 = vertex.texcoord[0]; PARAM mvp[4] = { state.matrix.mvp }; PARAM lightDir = program.env[0]; PARAM diffuse = program.env[2]; -PARAM ambient = state.lightmodel.ambient; +PARAM ambient = program.env[5]; PARAM zeroVec = { 0, 0, 0, 0 }; OUTPUT oPos = result.position; OUTPUT oColor = result.color; diff --git a/shaders/diffuse_texoff2_arb.vp b/shaders/diffuse_texoff2_arb.vp index 6e30427a6..880133c9b 100644 --- a/shaders/diffuse_texoff2_arb.vp +++ b/shaders/diffuse_texoff2_arb.vp @@ -12,7 +12,7 @@ PARAM diffuse0 = program.env[2]; PARAM lightDir1 = program.env[18]; PARAM diffuse1 = program.env[19]; PARAM texOffset = program.env[7]; -PARAM ambient = state.lightmodel.ambient; +PARAM ambient = program.env[5]; PARAM zeroVec = { 0, 0, 0, 0 }; OUTPUT oPos = result.position; OUTPUT oColor = result.color; diff --git a/shaders/diffuse_texoff_arb.vp b/shaders/diffuse_texoff_arb.vp index 3de42cd35..e8308ce40 100644 --- a/shaders/diffuse_texoff_arb.vp +++ b/shaders/diffuse_texoff_arb.vp @@ -10,7 +10,7 @@ PARAM mvp[4] = { state.matrix.mvp }; PARAM lightDir = program.env[0]; PARAM diffuse = program.env[2]; PARAM texOffset = program.env[7]; -PARAM ambient = state.lightmodel.ambient; +PARAM ambient = program.env[5]; PARAM zeroVec = { 0, 0, 0, 0 }; OUTPUT oPos = result.position; OUTPUT oColor = result.color; diff --git a/shaders/rings_arb.vp b/shaders/rings_arb.vp index 323362504..f93e0e083 100644 --- a/shaders/rings_arb.vp +++ b/shaders/rings_arb.vp @@ -10,7 +10,7 @@ PARAM mvp[4] = { state.matrix.mvp }; PARAM eyePos = program.env[1]; PARAM lightDir = program.env[0]; PARAM diffuse = program.env[2]; -PARAM ambient = state.lightmodel.ambient; +PARAM ambient = program.env[5]; PARAM texgen_s = program.env[10]; PARAM texgen_t = program.env[11]; PARAM half = 0.5;