summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2016-06-09 07:02:36 +1000
committerDave Airlie <[email protected]>2016-06-09 07:37:43 +1000
commit2df46519e4aeb330df30890c2702d96891c18964 (patch)
tree349e0ca6883251c708f5b1d12bf1b9400b1384e0
parent35616a9e0ef0511ebb77e7076c00f2eeb248933a (diff)
glsl/link_varyings: switch to 64bit check instead of double.
This is prep work for int64 support. Reviewed-by: Ilia Mirkin <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
-rw-r--r--src/compiler/glsl/link_varyings.cpp2
-rw-r--r--src/compiler/glsl/link_varyings.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp
index 99fb3fcdc00..67534a6ca82 100644
--- a/src/compiler/glsl/link_varyings.cpp
+++ b/src/compiler/glsl/link_varyings.cpp
@@ -886,7 +886,7 @@ tfeedback_decl::store(struct gl_context *ctx, struct gl_shader_program *prog,
}
if (explicit_stride && explicit_stride[buffer]) {
- if (this->is_double() && info->Buffers[buffer].Stride % 2) {
+ if (this->is_64bit() && info->Buffers[buffer].Stride % 2) {
linker_error(prog, "invalid qualifier xfb_stride=%d must be a "
"multiple of 8 as its applied to a type that is or "
"contains a double.",
diff --git a/src/compiler/glsl/link_varyings.h b/src/compiler/glsl/link_varyings.h
index 0ad4f740502..2126a5c6d98 100644
--- a/src/compiler/glsl/link_varyings.h
+++ b/src/compiler/glsl/link_varyings.h
@@ -151,7 +151,7 @@ public:
return this->size;
else
return this->vector_elements * this->matrix_columns * this->size *
- (this->is_double() ? 2 : 1);
+ (this->is_64bit() ? 2 : 1);
}
unsigned get_location() const {
@@ -160,7 +160,7 @@ public:
private:
- bool is_double() const
+ bool is_64bit() const
{
switch (this->type) {
case GL_DOUBLE: