*/}}
YimingWu пре 3 месеци
родитељ
комит
1d13829952
4 измењених фајлова са 3 додато и 6 уклоњено
  1. 0 4
      CMakeLists.txt
  2. 1 1
      ouroperations.c
  3. 1 0
      ourpaint.c
  4. 1 1
      ourshader.cpp

+ 0 - 4
CMakeLists.txt

@@ -23,10 +23,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-no-pie")
 set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-no-pie")
 
-if(${LAGUI_USE_GLES})
-    add_definitions(-DLA_USE_GLES)
-endif()
-
 find_package(lagui REQUIRED)
 find_package(PNG REQUIRED)
 find_package(LCMS2 REQUIRED)

+ 1 - 1
ouroperations.c

@@ -1076,7 +1076,7 @@ int our_MergeLayer(OurLayer* l){
             if((!ot) || (!ot->Texture)) our_LayerEnsureTileDirect(ol,row,col);
             glBindImageTexture(0, t->Texture->GLTexHandle, 0, GL_FALSE, 0, GL_READ_WRITE, OUR_CANVAS_GL_PIX);
             glBindImageTexture(1, ot->Texture->GLTexHandle, 0, GL_FALSE, 0, GL_READ_WRITE, OUR_CANVAS_GL_PIX);
-            glDispatchCompute(OUR_WORKGROUP_SIZE,OUR_WORKGROUP_SIZE,1);
+            glDispatchCompute(OUR_TILE_W/OUR_WORKGROUP_SIZE,OUR_TILE_W/OUR_WORKGROUP_SIZE,1);
             xmin=TNS_MIN2(xmin,t->l+seam);xmax=TNS_MAX2(xmax,t->r-seam); ymin=TNS_MIN2(ymin,t->b+seam);ymax=TNS_MAX2(ymax,t->u-seam);
         }
     }

+ 1 - 0
ourpaint.c

@@ -31,6 +31,7 @@ int main(int argc, char *argv[]){
     if(ourProcessInitArgs(argc,argv) < 0){ return 0; }
     laInitArguments ia={0}; laSetDefaultInitArguments(&ia);
     ia.GLMajor=4; ia.GLMinor=5;
+    ia.GLESMajor=3; ia.GLESMinor=2;
     ia.UseColorManagement=1;
     //ia.HasTextureInspector=1;
     ia.HasTerminal=1;

+ 1 - 1
ourshader.cpp

@@ -417,7 +417,7 @@ uvec4 cpack(vec4 c){
     (vec4(imageLoad(img,p))/65535.)
 #define OurImageStore(img, p, color) \
     imageStore(img,p,uvec4(vec4(color)*65535.))
-    
+
 #endif
 
 vec4 mix_over(vec4 colora, vec4 colorb){