Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
210c6bf4
Commit
210c6bf4
authored
May 10, 2016
by
John Kessenich
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #272 from antiagainst/appveyor
Configuration for Windows buildbot & fix a bug
parents
3357d870
cb3236d9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
6 deletions
+46
-6
.appveyor.yml
.appveyor.yml
+40
-0
Logger.cpp
SPIRV/Logger.cpp
+2
-2
Logger.h
SPIRV/Logger.h
+4
-4
No files found.
.appveyor.yml
0 → 100644
View file @
210c6bf4
# Windows Build Configuration for AppVeyor
# http://www.appveyor.com/docs/appveyor-yml
# build version format
version
:
"
{build}"
os
:
Visual Studio 2013
platform
:
-
Any CPU
configuration
:
-
Debug
-
Release
branches
:
only
:
-
master
clone_depth
:
5
matrix
:
fast_finish
:
true
# Show final status immediately if a test fails.
# scripts that run after cloning repository
install
:
-
git clone https://github.com/google/googletest.git External/googletest
build
:
parallel
:
true
# enable MSBuild parallel builds
verbosity
:
minimal
build_script
:
-
mkdir build && cd build
-
cmake .. -DCMAKE_INSTALL_PREFIX=install
-
cmake --build . --config %CONFIGURATION% --target install
test_script
:
-
ctest -C %CONFIGURATION% --output-on-failure
-
cd ../Test && bash runtests
SPIRV/Logger.cpp
View file @
210c6bf4
...
@@ -40,13 +40,13 @@
...
@@ -40,13 +40,13 @@
namespace
spv
{
namespace
spv
{
void
SpvBuildLogger
::
tbdFunctionality
(
const
char
*
f
)
void
SpvBuildLogger
::
tbdFunctionality
(
const
std
::
string
&
f
)
{
{
if
(
std
::
find
(
std
::
begin
(
tbdFeatures
),
std
::
end
(
tbdFeatures
),
f
)
==
std
::
end
(
tbdFeatures
))
if
(
std
::
find
(
std
::
begin
(
tbdFeatures
),
std
::
end
(
tbdFeatures
),
f
)
==
std
::
end
(
tbdFeatures
))
tbdFeatures
.
push_back
(
f
);
tbdFeatures
.
push_back
(
f
);
}
}
void
SpvBuildLogger
::
missingFunctionality
(
const
char
*
f
)
void
SpvBuildLogger
::
missingFunctionality
(
const
std
::
string
&
f
)
{
{
if
(
std
::
find
(
std
::
begin
(
missingFeatures
),
std
::
end
(
missingFeatures
),
f
)
==
std
::
end
(
missingFeatures
))
if
(
std
::
find
(
std
::
begin
(
missingFeatures
),
std
::
end
(
missingFeatures
),
f
)
==
std
::
end
(
missingFeatures
))
missingFeatures
.
push_back
(
f
);
missingFeatures
.
push_back
(
f
);
...
...
SPIRV/Logger.h
View file @
210c6bf4
...
@@ -48,9 +48,9 @@ public:
...
@@ -48,9 +48,9 @@ public:
SpvBuildLogger
(
const
SpvBuildLogger
&
)
=
delete
;
SpvBuildLogger
(
const
SpvBuildLogger
&
)
=
delete
;
// Registers a TBD functionality.
// Registers a TBD functionality.
void
tbdFunctionality
(
const
char
*
f
);
void
tbdFunctionality
(
const
std
::
string
&
f
);
// Registers a missing functionality.
// Registers a missing functionality.
void
missingFunctionality
(
const
char
*
f
);
void
missingFunctionality
(
const
std
::
string
&
f
);
// Logs a warning.
// Logs a warning.
void
warning
(
const
std
::
string
&
w
)
{
warnings
.
push_back
(
w
);
}
void
warning
(
const
std
::
string
&
w
)
{
warnings
.
push_back
(
w
);
}
...
@@ -62,8 +62,8 @@ public:
...
@@ -62,8 +62,8 @@ public:
std
::
string
getAllMessages
()
const
;
std
::
string
getAllMessages
()
const
;
private
:
private
:
std
::
vector
<
const
char
*
>
tbdFeatures
;
std
::
vector
<
std
::
string
>
tbdFeatures
;
std
::
vector
<
const
char
*
>
missingFeatures
;
std
::
vector
<
std
::
string
>
missingFeatures
;
std
::
vector
<
std
::
string
>
warnings
;
std
::
vector
<
std
::
string
>
warnings
;
std
::
vector
<
std
::
string
>
errors
;
std
::
vector
<
std
::
string
>
errors
;
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment