diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-09-14 21:36:43 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-09-14 21:36:43 +0000 |
| commit | 7c276329e815c84ea2403bb08c44ff60179c0cd6 (patch) | |
| tree | 9c4327b36e71c5c265fba1f1c8cbb9ae2497142a /src/mesa/main/light.h | |
| parent | edf8c06270a0e62f33e3f45e1f0307acfeff3b5d (diff) | |
more warning fixes (Karl Schultz)
Diffstat (limited to 'src/mesa/main/light.h')
| -rw-r--r-- | src/mesa/main/light.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h index 79fad5a98a..5cd24e83ff 100644 --- a/src/mesa/main/light.h +++ b/src/mesa/main/light.h @@ -1,4 +1,4 @@ -/* $Id: light.h,v 1.13 2001/04/28 08:39:17 keithw Exp $ */ +/* $Id: light.h,v 1.14 2001/09/14 21:36:43 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -78,6 +78,7 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params ); /* Lerp between adjacent values in the f(x) lookup table, giving a * continuous function, with adequeate overall accuracy. (Though * still pretty good compared to a straight lookup). + * Result should be a GLfloat. */ #define GET_SHINE_TAB_ENTRY( table, dp, result ) \ do { \ @@ -85,7 +86,7 @@ do { \ float f = (dp * (SHINE_TABLE_SIZE-1)); \ int k = (int) f; \ if (k > SHINE_TABLE_SIZE-2) \ - result = pow( dp, _tab->shininess ); \ + result = (GLfloat) pow( dp, _tab->shininess ); \ else \ result = _tab->tab[k] + (f-k)*(_tab->tab[k+1]-_tab->tab[k]); \ } while (0) |