glsl: fix the type of ir_constant_data::u16

[mesa.git] / src / compiler / glsl / link_atomics.cpp

diff --git a/src/compiler/glsl/link_atomics.cpp b/src/compiler/glsl/link_atomics.cpp
index d26e62a35b389df7cc5ff6af414484392d8f9604..bc03d64633be24e833836bc47f6ca5de7b850693 100644 (file)
--- a/src/compiler/glsl/link_atomics.cpp
+++ b/src/compiler/glsl/link_atomics.cpp
@@ -25,7 +25,9 @@
 #include "ir.h"
 #include "ir_uniform.h"
 #include "linker.h"
+#include "main/errors.h"
 #include "main/macros.h"
+#include "main/mtypes.h"
 
 namespace {
    /*
@@ -207,7 +209,7 @@ link_assign_atomic_counter_resources(struct gl_context *ctx,
    active_atomic_buffer *abs =
       find_active_atomic_counters(ctx, prog, &num_buffers);
 
-   prog->data->AtomicBuffers = rzalloc_array(prog, gl_active_atomic_buffer,
+   prog->data->AtomicBuffers = rzalloc_array(prog->data, gl_active_atomic_buffer,
                                              num_buffers);
    prog->data->NumAtomicBuffers = num_buffers;
 
@@ -270,7 +272,7 @@ link_assign_atomic_counter_resources(struct gl_context *ctx,
          struct gl_program *gl_prog = prog->_LinkedShaders[j]->Program;
          gl_prog->info.num_abos = num_atomic_buffers[j];
          gl_prog->sh.AtomicBuffers =
-            rzalloc_array(prog, gl_active_atomic_buffer *,
+            rzalloc_array(gl_prog, gl_active_atomic_buffer *,
                           num_atomic_buffers[j]);
 
          unsigned intra_stage_idx = 0;