Skip to content

Commit ba37a2b

Browse files
committed
Sync comments with ReRelease and version bump
1 parent f360fa7 commit ba37a2b

24 files changed

+502
-440
lines changed

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,8 @@ are provided without any warranty of support. The simplest way to check
133133
is renaming the mdl/dkm/fm format file to md2 and place instead the original
134134
tris.md2 file. FM is rendered with all meshes without support of
135135
filtering/selecting the exact part of the model.
136+
137+
### ReRelease Support
138+
139+
Use [Yamagi Quake II ReRelease](https://github.com/yquake2/yquake2remaster/releases)
140+
version with 2023 Quake ReRelease version.

src/common/header/common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "shared_safe.h"
3333
#include "crc.h"
3434

35-
#define VKVERSION "1.0.5"
35+
#define VKVERSION "1.0.6"
3636

3737
#ifndef YQ2OSTYPE
3838
#error YQ2OSTYPE should be defined by the build system

src/vk/header/local.h

+25-18
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
/*
2-
Copyright (C) 1997-2001 Id Software, Inc.
3-
Copyright (C) 2018-2019 Krzysztof Kondrak
4-
5-
This program is free software; you can redistribute it and/or
6-
modify it under the terms of the GNU General Public License
7-
as published by the Free Software Foundation; either version 2
8-
of the License, or (at your option) any later version.
9-
10-
This program is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13-
14-
See the GNU General Public License for more details.
15-
16-
You should have received a copy of the GNU General Public License
17-
along with this program; if not, write to the Free Software
18-
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19-
*/
2+
* Copyright (C) 1997-2001 Id Software, Inc.
3+
* Copyright (C) 2018-2019 Krzysztof Kondrak
4+
*
5+
* This program is free software; you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation; either version 2 of the License, or (at
8+
* your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful, but
11+
* WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13+
*
14+
* See the GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
19+
* 02111-1307, USA.
20+
*
21+
* =======================================================================
22+
*
23+
* Local header for the refresher.
24+
*
25+
* =======================================================================
26+
*/
2027

2128
#ifndef __VK_LOCAL_H__
2229
#define __VK_LOCAL_H__

src/vk/header/model.h

+8-10
Original file line numberDiff line numberDiff line change
@@ -173,19 +173,17 @@ typedef struct model_s
173173
vec3_t origin; // for sounds or lights
174174
} model_t;
175175

176-
//============================================================================
176+
void Mod_Init(void);
177+
const byte *Mod_ClusterPVS(int cluster, const model_t *model);
177178

178-
void Mod_Init (void);
179-
const byte *Mod_ClusterPVS (int cluster, const model_t *model);
179+
void Mod_Modellist_f(void);
180180

181-
void Mod_Modellist_f (void);
181+
void *Hunk_Begin(int maxsize);
182+
void *Hunk_Alloc(int size);
183+
int Hunk_End(void);
184+
void Hunk_Free(void *base);
182185

183-
void *Hunk_Begin (int maxsize);
184-
void *Hunk_Alloc (int size);
185-
int Hunk_End (void);
186-
void Hunk_Free (void *base);
187-
188-
void Mod_FreeAll (void);
186+
void Mod_FreeAll(void);
189187
void Mod_FreeModelsKnown (void);
190188

191189
#endif

src/vk/header/qvk.h

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
/*
2-
Copyright (C) 1997-2001 Id Software, Inc.
3-
Copyright (C) 2018-2019 Krzysztof Kondrak
2+
* Copyright (C) 1997-2001 Id Software, Inc.
3+
* Copyright (C) 2018-2019 Krzysztof Kondrak
4+
*
5+
* This program is free software; you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation; either version 2 of the License, or (at
8+
* your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful, but
11+
* WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13+
*
14+
* See the GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
19+
* 02111-1307, USA.
20+
*
21+
*/
422

5-
This program is free software; you can redistribute it and/or
6-
modify it under the terms of the GNU General Public License
7-
as published by the Free Software Foundation; either version 2
8-
of the License, or (at your option) any later version.
9-
10-
This program is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13-
14-
See the GNU General Public License for more details.
15-
16-
You should have received a copy of the GNU General Public License
17-
along with this program; if not, write to the Free Software
18-
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19-
20-
*/
2123
/*
2224
** QVK.H
2325
*/

src/vk/header/shaders.h

+19-18
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
/*
2-
Copyright (C) 2018-2019 Krzysztof Kondrak
3-
4-
This program is free software; you can redistribute it and/or
5-
modify it under the terms of the GNU General Public License
6-
as published by the Free Software Foundation; either version 2
7-
of the License, or (at your option) any later version.
8-
9-
This program is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12-
13-
See the GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License
16-
along with this program; if not, write to the Free Software
17-
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18-
19-
*/
2+
* Copyright (C) 2018-2019 Krzysztof Kondrak
3+
*
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or (at
7+
* your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful, but
10+
* WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12+
*
13+
* See the GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program; if not, write to the Free Software
17+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
18+
* 02111-1307, USA.
19+
*
20+
*/
2021

2122
//
2223
// game shaders, compiled offline

src/vk/header/util.h

+20-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
/*
2-
Copyright (C) 2018 Christoph Schied
3-
Copyright (C) 2020 Denis Pauk
4-
5-
This program is free software; you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation; either version 2 of the License, or
8-
(at your option) any later version.
9-
10-
This program is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License along
16-
with this program; if not, write to the Free Software Foundation, Inc.,
17-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18-
*/
2+
* Copyright (C) 2018 Christoph Schied
3+
* Copyright (C) 2020 Denis Pauk
4+
*
5+
* This program is free software; you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation; either version 2 of the License, or (at
8+
* your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful, but
11+
* WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13+
*
14+
* See the GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
19+
* 02111-1307, USA.
20+
*
21+
*/
1922

2023
#ifndef __VK_UTIL_H__
2124
#define __VK_UTIL_H__

src/vk/vk_buffer.c

+19-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
/*
2-
Copyright (C) 2018-2019 Krzysztof Kondrak
3-
4-
This program is free software; you can redistribute it and/or
5-
modify it under the terms of the GNU General Public License
6-
as published by the Free Software Foundation; either version 2
7-
of the License, or (at your option) any later version.
8-
9-
This program is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12-
13-
See the GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License
16-
along with this program; if not, write to the Free Software
17-
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18-
*/
2+
* Copyright (C) 2018-2019 Krzysztof Kondrak
3+
*
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or (at
7+
* your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful, but
10+
* WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12+
*
13+
* See the GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program; if not, write to the Free Software
17+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
18+
* 02111-1307, USA.
19+
*
20+
*/
1921

2022
#include "header/local.h"
2123

src/vk/vk_cmd.c

+19-18
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
/*
2-
Copyright (C) 2018-2019 Krzysztof Kondrak
3-
4-
This program is free software; you can redistribute it and/or
5-
modify it under the terms of the GNU General Public License
6-
as published by the Free Software Foundation; either version 2
7-
of the License, or (at your option) any later version.
8-
9-
This program is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12-
13-
See the GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License
16-
along with this program; if not, write to the Free Software
17-
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18-
19-
*/
2+
* Copyright (C) 2018-2019 Krzysztof Kondrak
3+
*
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or (at
7+
* your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful, but
10+
* WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12+
*
13+
* See the GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program; if not, write to the Free Software
17+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
18+
* 02111-1307, USA.
19+
*
20+
*/
2021

2122
#include "header/local.h"
2223

src/vk/vk_common.c

+35-29
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
11
/*
2-
Copyright (C) 1997-2001 Id Software, Inc.
3-
Copyright (C) 2018-2019 Krzysztof Kondrak
4-
5-
This program is free software; you can redistribute it and/or
6-
modify it under the terms of the GNU General Public License
7-
as published by the Free Software Foundation; either version 2
8-
of the License, or (at your option) any later version.
9-
10-
This program is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13-
14-
See the GNU General Public License for more details.
15-
16-
You should have received a copy of the GNU General Public License
17-
along with this program; if not, write to the Free Software
18-
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19-
*/
2+
* Copyright (C) 1997-2001 Id Software, Inc.
3+
* Copyright (C) 2018-2019 Krzysztof Kondrak
4+
*
5+
* This program is free software; you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation; either version 2 of the License, or (at
8+
* your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful, but
11+
* WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13+
*
14+
* See the GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
19+
* 02111-1307, USA.
20+
*
21+
* =======================================================================
22+
*
23+
* This file implements the operating system binding of Vk to QVk function
24+
* pointers. When doing a port of Quake2 you must implement the following
25+
* two functions:
26+
*
27+
* QVk_Init() - loads libraries, assigns function pointers, etc.
28+
* QVk_Shutdown() - unloads libraries, NULLs function pointers
29+
*
30+
* =======================================================================
31+
*
32+
*/
2033

21-
/*
22-
** VK_COMMON.C
23-
**
24-
** This file implements the operating system binding of Vk to QVk function
25-
** pointers. When doing a port of Quake2 you must implement the following
26-
** two functions:
27-
**
28-
** QVk_Init() - loads libraries, assigns function pointers, etc.
29-
** QVk_Shutdown() - unloads libraries, NULLs function pointers
30-
*/
3134
#include <float.h>
3235
#include "header/local.h"
3336

@@ -2668,7 +2671,10 @@ void QVk_DrawTexRect(const float *ubo, VkDeviceSize uboSize, qvktexture_t *textu
26682671

26692672
QVk_BindPipeline(&vk_drawTexQuadPipeline[vk_state.current_renderpass]);
26702673
VkDeviceSize offsets = 0;
2671-
VkDescriptorSet descriptorSets[] = { texture->descriptorSet, uboDescriptorSet };
2674+
VkDescriptorSet descriptorSets[] = {
2675+
texture->descriptorSet,
2676+
uboDescriptorSet
2677+
};
26722678

26732679
float gamma = 2.1F - vid_gamma->value;
26742680

0 commit comments

Comments
 (0)