Skip to content

Commit 7f8bdc9

Browse files
authored
fix GLES/GL shared contexts define, move serialization instead (#19169)
1 parent 4205c2e commit 7f8bdc9

1 file changed

Lines changed: 22 additions & 22 deletions

File tree

libretro-common/include/libretro.h

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1684,20 +1684,18 @@ enum retro_mod
16841684
#define RETRO_ENVIRONMENT_SET_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE (43 | RETRO_ENVIRONMENT_EXPERIMENTAL)
16851685

16861686
/**
1687-
* Notifies the frontend of any quirks associated with serialization.
1687+
* The frontend will try to use a "shared" context when setting up a hardware context.
1688+
* Mostly applicable to OpenGL.
16881689
*
1689-
* Should be set in either \c retro_init or \c retro_load_game, but not both.
1690-
* @param[in, out] data <tt>uint64_t *</tt>.
1691-
* Pointer to the core's serialization quirks.
1692-
* The frontend will set the flags of the quirks it supports
1693-
* and clear the flags of those it doesn't.
1694-
* Behavior is undefined if \c NULL.
1695-
* @return \c true if this environment call is supported.
1696-
* @see retro_serialize
1697-
* @see retro_unserialize
1698-
* @see RETRO_SERIALIZATION_QUIRK
1690+
* In order for this to have any effect,
1691+
* the core must call \c RETRO_ENVIRONMENT_SET_HW_RENDER at some point
1692+
* if it hasn't already.
1693+
*
1694+
* @param data Ignored.
1695+
* @returns \c true if the environment call is available
1696+
* and the frontend supports shared hardware contexts.
16991697
*/
1700-
#define RETRO_ENVIRONMENT_SET_SERIALIZATION_QUIRKS 44
1698+
#define RETRO_ENVIRONMENT_SET_HW_SHARED_CONTEXT (44 | RETRO_ENVIRONMENT_EXPERIMENTAL)
17011699

17021700
/**
17031701
* Returns an interface that the core can use to access the file system.
@@ -2702,18 +2700,20 @@ enum retro_mod
27022700
#define RETRO_ENVIRONMENT_GET_MEMORY_STATUS (86 | RETRO_ENVIRONMENT_EXPERIMENTAL)
27032701

27042702
/**
2705-
* The frontend will try to use a "shared" context when setting up a hardware context.
2706-
* Mostly applicable to OpenGL.
2707-
*
2708-
* In order for this to have any effect,
2709-
* the core must call \c RETRO_ENVIRONMENT_SET_HW_RENDER at some point
2710-
* if it hasn't already.
2703+
* Notifies the frontend of any quirks associated with serialization.
27112704
*
2712-
* @param data Ignored.
2713-
* @returns \c true if the environment call is available
2714-
* and the frontend supports shared hardware contexts.
2705+
* Should be set in either \c retro_init or \c retro_load_game, but not both.
2706+
* @param[in, out] data <tt>uint64_t *</tt>.
2707+
* Pointer to the core's serialization quirks.
2708+
* The frontend will set the flags of the quirks it supports
2709+
* and clear the flags of those it doesn't.
2710+
* Behavior is undefined if \c NULL.
2711+
* @return \c true if this environment call is supported.
2712+
* @see retro_serialize
2713+
* @see retro_unserialize
2714+
* @see RETRO_SERIALIZATION_QUIRK
27152715
*/
2716-
#define RETRO_ENVIRONMENT_SET_HW_SHARED_CONTEXT (87 | RETRO_ENVIRONMENT_EXPERIMENTAL)
2716+
#define RETRO_ENVIRONMENT_SET_SERIALIZATION_QUIRKS 87
27172717

27182718
/**
27192719
* Result of \c RETRO_ENVIRONMENT_GET_MEMORY_STATUS.

0 commit comments

Comments
 (0)