Fix the upload type of the image.

diff --git a/encoder.shader b/encoder.shader
index 7f0822acbf7779b2fbdee52ec7bd883837348c7f..54103a093d374cca0fb2fcda37a7add308574268 100644 (file)
--- a/encoder.shader
+++ b/encoder.shader
@@ -8,7 +8,7 @@ layout(r16ui) uniform restrict writeonly uimage2D ac1_ac6_tex;
 layout(r16ui) uniform restrict writeonly uimage2D ac2_ac5_tex;
 layout(r8i) uniform restrict writeonly iimage2D ac3_tex;
 layout(r8i) uniform restrict writeonly iimage2D ac4_tex;
-layout(r8i) uniform restrict readonly iimage2D image_tex;
+layout(r8ui) uniform restrict readonly uimage2D image_tex;
 
 shared float temp[64];
 

diff --git a/narabu-encoder.cpp b/narabu-encoder.cpp
index 9e9f0ab8c036904717a79a5a2a6decfec07a3934..ba3e914406d76015af99de32efa3fd7f51bffb70 100644 (file)
--- a/narabu-encoder.cpp
+++ b/narabu-encoder.cpp
@@ -342,7 +342,7 @@ int main(int argc, char **argv)
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_R8I, WIDTH, HEIGHT, 0, GL_RED_INTEGER, GL_UNSIGNED_BYTE, pix_y);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_R8UI, WIDTH, HEIGHT, 0, GL_RED_INTEGER, GL_UNSIGNED_BYTE, pix_y);
        check_error();
 
        // Make destination textures.
@@ -388,7 +388,7 @@ int main(int argc, char **argv)
        glBindImageTexture(2, ac2_ac5_tex, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R16UI);
        glBindImageTexture(3, ac3_tex, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R8I);
        glBindImageTexture(4, ac4_tex, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R8I);
-       glBindImageTexture(5, y_tex, 0, GL_FALSE, 0, GL_READ_ONLY, GL_R8I);
+       glBindImageTexture(5, y_tex, 0, GL_FALSE, 0, GL_READ_ONLY, GL_R8UI);
        check_error();
 
        steady_clock::time_point start = steady_clock::now();