Nicolas Winkler 6 년 전
부모
커밋
55ee1ae949
3개의 변경된 파일6개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 3
      Almond.pro
  2. 1 1
      MandelWidget.cpp
  3. 2 0
      libmandel/src/mandel.cpp

+ 3 - 3
Almond.pro

@@ -79,9 +79,9 @@ unix:LIBS += -lm -latomic
 #win32:INCLUDEPATH += $$PWD/'../../../../../Program Files (x86)/AMD APP SDK/3.0/include'
 #win32:DEPENDPATH += $$PWD/'../../../../../Program Files (x86)/AMD APP SDK/3.0/include'
 
-win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../libs/ffmpeg-4.1.1-win32-dev/lib/ -lavformat
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../libs/ffmpeg-4.1.1-win32-dev/lib/ -lavformat
-else:unix: LIBS += -L$$PWD/../libs/ffmpeg-4.1.1-win32-dev/lib/ -lavformat
+#win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../libs/ffmpeg-4.1.1-win32-dev/lib/ -lavformat
+#else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../libs/ffmpeg-4.1.1-win32-dev/lib/ -lavformat
+#else:unix: LIBS += -L$$PWD/../libs/ffmpeg-4.1.1-win32-dev/lib/ -lavformat
 
 #INCLUDEPATH += $$PWD/../libs/ffmpeg-4.1.1-win32-dev/include
 #DEPENDPATH += $$PWD/../libs/ffmpeg-4.1.1-win32-dev/include

+ 1 - 1
MandelWidget.cpp

@@ -107,7 +107,7 @@ void MandelView::adaptViewport(const MandelViewport& vp)
 MandelWidget::MandelWidget(mnd::MandelContext& ctxt, QWidget* parent) :
     QGLWidget{ QGLFormat(QGL::SampleBuffers), parent },
     mndContext{ ctxt },
-    mv{ *ctxt.getDevices()[0].getGenerator128() }
+    mv{ ctxt.getDefaultGenerator() }
 {
     this->setContentsMargins(0, 0, 0, 0);
     this->setSizePolicy(QSizePolicy::Expanding,

+ 2 - 0
libmandel/src/mandel.cpp

@@ -75,6 +75,7 @@ std::vector<MandelDevice> MandelContext::createDevices(void)
 {
     std::vector<MandelDevice> mandelDevices;
 
+    /*
     std::vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
     platforms.erase(platforms.begin() + 1);
@@ -129,6 +130,7 @@ std::vector<MandelDevice> MandelContext::createDevices(void)
             mandelDevices.push_back(std::move(md));
         }
     }
+    */
     return mandelDevices;
 }