Skip to content

Commit 8186278

Browse files
Fix newlines in old merge, oops.
This is now showing up in git because I touched it, and it's got the wrong newlines. Just making it go away.
1 parent acdd080 commit 8186278

1 file changed

Lines changed: 27 additions & 27 deletions

File tree

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
// Copyright (c) 2014- PPSSPP Project.
2-
3-
// This program is free software: you can redistribute it and/or modify
4-
// it under the terms of the GNU General Public License as published by
5-
// the Free Software Foundation, version 2.0 or later versions.
6-
7-
// This program is distributed in the hope that it will be useful,
8-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
9-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10-
// GNU General Public License 2.0 for more details.
11-
12-
// A copy of the GPL 2.0 should have been included with the program.
13-
// If not, see http://www.gnu.org/licenses/
14-
15-
// Official git repository and contact information can be found at
16-
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
17-
18-
#pragma once
19-
20-
#include "GPU/ge_constants.h"
21-
22-
enum ShaderLanguage {
23-
GLSL_140,
24-
GLSL_300,
25-
HLSL_DX9,
26-
};
27-
1+
// Copyright (c) 2014- PPSSPP Project.
2+
3+
// This program is free software: you can redistribute it and/or modify
4+
// it under the terms of the GNU General Public License as published by
5+
// the Free Software Foundation, version 2.0 or later versions.
6+
7+
// This program is distributed in the hope that it will be useful,
8+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
// GNU General Public License 2.0 for more details.
11+
12+
// A copy of the GPL 2.0 should have been included with the program.
13+
// If not, see http://www.gnu.org/licenses/
14+
15+
// Official git repository and contact information can be found at
16+
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
17+
18+
#pragma once
19+
20+
#include "GPU/ge_constants.h"
21+
22+
enum ShaderLanguage {
23+
GLSL_140,
24+
GLSL_300,
25+
HLSL_DX9,
26+
};
27+
2828
void GenerateDepalShader(char *buffer, GEBufferFormat pixelFormat, ShaderLanguage language);

0 commit comments

Comments
 (0)