diff options
| author | Brian Paul <[email protected]> | 2009-09-30 21:08:06 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-09-30 21:08:06 -0600 |
| commit | 3d6a20e5b6c7567ed64fceed7744cf39eea34400 (patch) | |
| tree | a15ebc6c17c892c6c5b858db0c613d4b9ae18667 | |
| parent | 60843e3ee59b00cee4ec1048823d1dd24756d849 (diff) | |
mesa: rename texformat_tmp.h to texfetch_tmp.h
| -rw-r--r-- | src/mesa/main/texfetch.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/texfetch_tmp.h (renamed from src/mesa/main/texformat_tmp.h) | 12 | ||||
| -rw-r--r-- | windows/VC7/mesa/mesa/mesa.vcproj | 2 | ||||
| -rw-r--r-- | windows/VC8/mesa/mesa/mesa.vcproj | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/src/mesa/main/texfetch.c b/src/mesa/main/texfetch.c index 3cc424fdc83..62a8b534099 100644 --- a/src/mesa/main/texfetch.c +++ b/src/mesa/main/texfetch.c @@ -77,13 +77,13 @@ nonlinear_to_linear(GLubyte cs8) /* Texel fetch routines for all supported formats */ #define DIM 1 -#include "texformat_tmp.h" +#include "texfetch_tmp.h" #define DIM 2 -#include "texformat_tmp.h" +#include "texfetch_tmp.h" #define DIM 3 -#include "texformat_tmp.h" +#include "texfetch_tmp.h" /** * Null texel fetch function. diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texfetch_tmp.h index 199849d6ac1..3ac932b9790 100644 --- a/src/mesa/main/texformat_tmp.h +++ b/src/mesa/main/texfetch_tmp.h @@ -1,9 +1,9 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 + * Version: 7.7 * - * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. - * Copyright (c) 2008 VMware, Inc. + * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. + * Copyright (c) 2008-2009 VMware, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -25,18 +25,16 @@ /** - * \file texformat_tmp.h + * \file texfetch_tmp.h * Texel fetch functions template. * - * This template file is used by texformat.c to generate texel fetch functions + * This template file is used by texfetch.c to generate texel fetch functions * for 1-D, 2-D and 3-D texture images. * * It should be expanded by defining \p DIM as the number texture dimensions * (1, 2 or 3). According to the value of \p DIM a series of macros is defined * for the texel lookup in the gl_texture_image::Data. * - * \sa texformat.c and FetchTexel. - * * \author Gareth Hughes * \author Brian Paul */ diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj index 9a24acf8196..100d83d8cd2 100644 --- a/windows/VC7/mesa/mesa/mesa.vcproj +++ b/windows/VC7/mesa/mesa/mesa.vcproj @@ -1167,7 +1167,7 @@ RelativePath="..\..\..\..\src\mesa\main\texformat.h">
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h">
+ RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h">
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\teximage.h">
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj index ec413141954..efc243929e5 100644 --- a/windows/VC8/mesa/mesa/mesa.vcproj +++ b/windows/VC8/mesa/mesa/mesa.vcproj @@ -1888,7 +1888,7 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h"
+ RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h"
>
</File>
<File
|