diff options
| author | Jeremy Kolb <jkolb@brandeis.edu> | 2007-01-21 20:47:10 -0500 |
|---|---|---|
| committer | Jeremy Kolb <jkolb@brandeis.edu> | 2007-01-21 20:47:10 -0500 |
| commit | 95fc270b06f07268732ade745084410bbc877168 (patch) | |
| tree | 8666e2d1052afc3881038a34d94ffbf001a2160e /src/mesa/drivers/dri/nouveau/nouveau_shader.c | |
| parent | ea441355d304ceff0d7eac4e112ed713ea08a43f (diff) | |
| parent | d1f0a55af42c8a34c2d59ca003e7d7a8263665fb (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_shader.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_shader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_shader.c b/src/mesa/drivers/dri/nouveau/nouveau_shader.c index dc366b36c0..e4db115362 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_shader.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_shader.c @@ -111,7 +111,7 @@ nvsUpdateShader(GLcontext *ctx, nouveauShader *nvs) /* Translate to HW format now if necessary */ if (!nvs->translated) { /* Mesa ASM shader -> nouveauShader */ - if (!nouveau_shader_pass0_arb(ctx, nvs)) + if (!nouveau_shader_pass0(ctx, nvs)) return GL_FALSE; /* Basic dead code elimination + register usage info */ if (!nouveau_shader_pass1(nvs)) @@ -187,7 +187,7 @@ nvsBuildTextShader(GLcontext *ctx, GLenum target, const char *text) &nvs->mesa.fp); } - nouveau_shader_pass0_arb(ctx, nvs); + nouveau_shader_pass0(ctx, nvs); nouveau_shader_pass1(nvs); nouveau_shader_pass2(nvs); |