diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 22:07:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 22:08:19 +0100 |
| commit | 84964de9dd2f385a51f91aa54e464c37a116e8ef (patch) | |
| tree | 165398b241bb728f5ff71966855b5fba0c5f1f54 /mesalib | |
| parent | b7f01cb1f6cfd1ec301f650a073436c91ec614aa (diff) | |
| download | vcxsrv-84964de9dd2f385a51f91aa54e464c37a116e8ef.tar.gz vcxsrv-84964de9dd2f385a51f91aa54e464c37a116e8ef.tar.bz2 vcxsrv-84964de9dd2f385a51f91aa54e464c37a116e8ef.zip | |
Solved compiler errors and warnings
Diffstat (limited to 'mesalib')
| -rw-r--r-- | mesalib/src/glsl/ir_builder.cpp | 2 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 1 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir_builder.cpp b/mesalib/src/glsl/ir_builder.cpp index 1e0dd5419..7f41ed69e 100644 --- a/mesalib/src/glsl/ir_builder.cpp +++ b/mesalib/src/glsl/ir_builder.cpp @@ -506,7 +506,7 @@ b2f(operand a) } ir_expression * -fma_mesa(operand a, operand b, operand c) +fma(operand a, operand b, operand c) { return expr(ir_triop_fma, a, b, c); } diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 0310a6172..640f07bbf 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -316,6 +316,7 @@ <ClCompile Include="..\..\..\..\src\mesa\main\remap.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\set.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\shaderimage.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shader_query.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\main\texcompress_cpal.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 53d113e6c..d2094db84 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -773,6 +773,9 @@ <ClCompile Include="..\..\..\..\src\mesa\main\textureview.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\shaderimage.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
|