History

Merge branch 'master' of https://github.com/highfidelity/hifi into rig

Howard Stearns committed 11 years ago

Commit b6853782 parents 51ed912 569ed4b33 files · +211 −209Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 33 files). Show all

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+5−5
@@ -9,22 +9,22 @@ · 8 unmodified lines
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10//10//
11 11
12// include this before QOpenGLBuffer, which includes an earlier version of OpenGL12#include "GeometryCache.h"
13
13#include <cmath>14#include <cmath>
14 15
15#include <QNetworkReply>16#include <QNetworkReply>
16#include <QRunnable>17#include <QRunnable>
17#include <QThreadPool>18#include <QThreadPool>
18 19
19#include <gpu/Batch.h>
20#include <gpu/GLBackend.h>
21
22#include <FSTReader.h>20#include <FSTReader.h>
23#include <NumericalConstants.h>21#include <NumericalConstants.h>
24 22
23#include <gpu/Batch.h>
24#include <gpu/GLBackend.h>
25
25#include "TextureCache.h"26#include "TextureCache.h"
26#include "RenderUtilsLogging.h"27#include "RenderUtilsLogging.h"
27#include "GeometryCache.h"
28 28
29#include "standardTransformPNTC_vert.h"29#include "standardTransformPNTC_vert.h"
30#include "standardDrawTexture_frag.h"30#include "standardDrawTexture_frag.h"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t