summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2017-11-04 16:09:48 -0400
committerYong He <yonghe@outlook.com>2017-11-04 16:09:48 -0400
commit288841f66c808af70ad7687f9704c87075129b18 (patch)
treeb6e2e4f5a28be28b28a346f3803121c34bb28f87 /tools
parent664e0da8dff1d04860cc46ce8139cbd47e15c552 (diff)
fixed all warnings
Diffstat (limited to 'tools')
-rw-r--r--tools/eval-test/main.cpp3
-rw-r--r--tools/render-test/render-d3d11.cpp2
-rw-r--r--tools/render-test/render-gl.cpp6
-rw-r--r--tools/slang-generate/main.cpp9
4 files changed, 13 insertions, 7 deletions
diff --git a/tools/eval-test/main.cpp b/tools/eval-test/main.cpp
index 486de7bd9..0159f0107 100644
--- a/tools/eval-test/main.cpp
+++ b/tools/eval-test/main.cpp
@@ -16,7 +16,8 @@ int main(
char const* inputPath = argv[1];
// Slurp in the input file, so that we can compile and run it
- FILE* inputFile = fopen(inputPath, "rb");
+ FILE* inputFile;
+ fopen_s(&inputFile, inputPath, "rb");
assert(inputFile);
fseek(inputFile, 0, SEEK_END);
diff --git a/tools/render-test/render-d3d11.cpp b/tools/render-test/render-d3d11.cpp
index ee34445d0..a40e6e6e0 100644
--- a/tools/render-test/render-d3d11.cpp
+++ b/tools/render-test/render-d3d11.cpp
@@ -1088,7 +1088,7 @@ public:
}
else
{
- printf("invalid output type at %d.\n");
+ printf("invalid output type at %d.\n", id);
}
}
id++;
diff --git a/tools/render-test/render-gl.cpp b/tools/render-test/render-gl.cpp
index a853a53a4..f07e27985 100644
--- a/tools/render-test/render-gl.cpp
+++ b/tools/render-test/render-gl.cpp
@@ -8,6 +8,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "core/basic.h"
+#include "core/secure-crt.h"
#include "external/stb/stb_image_write.h"
// TODO(tfoley): eventually we should be able to run these
@@ -736,7 +737,7 @@ public:
{
glSamplerParameteri(rs.handle, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
glSamplerParameteri(rs.handle, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glSamplerParameteri(rs.handle, GL_TEXTURE_MAX_ANISOTROPY_EXT, 8.0f);
+ glSamplerParameteri(rs.handle, GL_TEXTURE_MAX_ANISOTROPY_EXT, 8);
}
else
{
@@ -802,7 +803,8 @@ public:
virtual void serializeOutput(BindingState* state, const char * fileName)
{
GLBindingState * glState = (GLBindingState*)state;
- FILE * f = fopen(fileName, "wt");
+ FILE * f;
+ fopen_s(&f, fileName, "wt");
for (auto & entry : glState->entries)
{
if (entry.isOutput)
diff --git a/tools/slang-generate/main.cpp b/tools/slang-generate/main.cpp
index eef7d95c7..8208354e4 100644
--- a/tools/slang-generate/main.cpp
+++ b/tools/slang-generate/main.cpp
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "../../source/core/secure-crt.h"
struct StringSpan
{
@@ -401,7 +402,8 @@ int main(
// Read the contents o the file and translate it into a "template" file
- FILE* inputStream = fopen(inputPath, "rb");
+ FILE* inputStream;
+ fopen_s(&inputStream, inputPath, "rb");
fseek(inputStream, 0, SEEK_END);
size_t inputSize = ftell(inputStream);
fseek(inputStream, 0, SEEK_SET);
@@ -415,9 +417,10 @@ int main(
Node* node = readInput(input, inputEnd);
char outputPath[1024];
- sprintf(outputPath, "%s.h", inputPath);
+ sprintf_s(outputPath, "%s.h", inputPath);
- FILE* outputStream = fopen(outputPath, "w");
+ FILE* outputStream;
+ fopen_s(&outputStream, outputPath, "w");
emitBody(outputStream, node);