Merge master branch from upstream
This commit is contained in:
commit
bba5c80957
90 changed files with 10601 additions and 9852 deletions
|
|
@ -513,8 +513,8 @@ public:
|
|||
int layoutOffset;
|
||||
int layoutAlign;
|
||||
|
||||
unsigned int layoutLocation : 7;
|
||||
static const unsigned int layoutLocationEnd = 0x3F;
|
||||
unsigned int layoutLocation :12;
|
||||
static const unsigned int layoutLocationEnd = 0xFFF;
|
||||
|
||||
unsigned int layoutComponent : 3;
|
||||
static const unsigned int layoutComponentEnd = 4;
|
||||
|
|
@ -574,7 +574,7 @@ public:
|
|||
}
|
||||
bool hasLocation() const
|
||||
{
|
||||
return layoutLocation != layoutLocationEnd;
|
||||
return layoutLocation != layoutLocationEnd;
|
||||
}
|
||||
bool hasComponent() const
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
// For the version, it uses the latest git tag followed by the number of commits.
|
||||
// For the date, it uses the current date (when then script is run).
|
||||
|
||||
#define GLSLANG_REVISION "3.0.750"
|
||||
#define GLSLANG_DATE "13-Sep-2015"
|
||||
#define GLSLANG_REVISION "3.0.756"
|
||||
#define GLSLANG_DATE "15-Sep-2015"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue