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
6a6e311d
Unverified
Commit
6a6e311d
authored
Sep 08, 2020
by
John Kessenich
Committed by
GitHub
Sep 08, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2388 from Tobski/rq-initialization-error
Error when initializing rayQuery with assignment
parents
dc1b9762
395bce6c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
0 deletions
+23
-0
rayQuery-initialization.Error.comp.out
Test/baseResults/rayQuery-initialization.Error.comp.out
+6
-0
rayQuery-initialization.Error.comp
Test/rayQuery-initialization.Error.comp
+9
-0
ParseHelper.cpp
glslang/MachineIndependent/ParseHelper.cpp
+6
-0
Spv.FromFile.cpp
gtests/Spv.FromFile.cpp
+2
-0
No files found.
Test/baseResults/rayQuery-initialization.Error.comp.out
0 → 100644
View file @
6a6e311d
rayQuery-initialization.Error.comp
ERROR: 0:7: '=' : ray queries can only be initialized by using the rayQueryInitializeEXT intrinsic: bar
ERROR: 1 compilation errors. No code generated.
SPIR-V is not generated for failed compile or link
Test/rayQuery-initialization.Error.comp
0 → 100644
View file @
6a6e311d
#version 460
#extension GL_EXT_ray_query : enable
void main () {
rayQueryEXT foo;
rayQueryEXT bar = foo;
}
\ No newline at end of file
glslang/MachineIndependent/ParseHelper.cpp
View file @
6a6e311d
...
@@ -6561,6 +6561,12 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
...
@@ -6561,6 +6561,12 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
type
.
copyArrayInnerSizes
(
publicType
.
arraySizes
);
type
.
copyArrayInnerSizes
(
publicType
.
arraySizes
);
arrayOfArrayVersionCheck
(
loc
,
type
.
getArraySizes
());
arrayOfArrayVersionCheck
(
loc
,
type
.
getArraySizes
());
if
(
initializer
)
{
if
(
type
.
getBasicType
()
==
EbtRayQuery
)
{
error
(
loc
,
"ray queries can only be initialized by using the rayQueryInitializeEXT intrinsic:"
,
"="
,
identifier
.
c_str
());
}
}
if
(
type
.
isCoopMat
())
{
if
(
type
.
isCoopMat
())
{
intermediate
.
setUseVulkanMemoryModel
();
intermediate
.
setUseVulkanMemoryModel
();
intermediate
.
setUseStorageBuffer
();
intermediate
.
setUseStorageBuffer
();
...
...
gtests/Spv.FromFile.cpp
View file @
6a6e311d
//
//
// Copyright (C) 2016 Google, Inc.
// Copyright (C) 2016 Google, Inc.
// Copyright (C) 2019 ARM Limited.
// Copyright (C) 2019 ARM Limited.
// Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
//
//
// All rights reserved.
// All rights reserved.
//
//
...
@@ -238,6 +239,7 @@ INSTANTIATE_TEST_SUITE_P(
...
@@ -238,6 +239,7 @@ INSTANTIATE_TEST_SUITE_P(
"rayQuery-committed.Error.rgen"
,
"rayQuery-committed.Error.rgen"
,
"rayQuery-allOps.comp"
,
"rayQuery-allOps.comp"
,
"rayQuery-allOps.frag"
,
"rayQuery-allOps.frag"
,
"rayQuery-initialization.Error.comp"
,
"spv.set.vert"
,
"spv.set.vert"
,
"spv.double.comp"
,
"spv.double.comp"
,
"spv.100ops.frag"
,
"spv.100ops.frag"
,
...
...
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